Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support rosetta on Apple silicon #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support rosetta on Apple silicon #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.17 FATAL_ERROR)
PROJECT (TMC2 CXX C )
SET( TMC2_VERSION_MAJOR 18 )
SET( TMC2_VERSION_MINOR 0 )
SET(CMAKE_OSX_ARCHITECTURES "x86_64")

# Video encoder and decoder library and application:
OPTION( USE_JMAPP_VIDEO_CODEC "Use JM application to encode and decode video" TRUE ) # JMAPP = 0
Expand Down
2 changes: 1 addition & 1 deletion source/lib/PccLibBitstreamCommon/include/PCCBitstream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ class PCCBitstream {
position_.bytes_ += size;
return *this;
}
void copyFrom( PCCBitstream& dataBitstream, const uint64_t startByte, const uint64_t bitstreamSize );
void copyFrom( PCCBitstream& dataBitstream, const size_t startByte, const size_t bitstreamSize );
void copyTo( PCCBitstream& dataBitstream, const size_t size );
void writeVideoStream( PCCVideoBitstream& videoBitstream );
void readVideoStream( PCCVideoBitstream& videoBitstream, size_t videoStreamSize );
Expand Down
1 change: 1 addition & 0 deletions source/lib/PccLibBitstreamCommon/source/PCCBitstream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ void PCCBitstream::writeVideoStream( PCCVideoBitstream& videoBitstream ) {
position_.bytes_ += size;
videoBitstream.trace();
}

void PCCBitstream::copyFrom( PCCBitstream& srcBitstream, const size_t position, const size_t size ) {
if ( data_.size() < position_.bytes_ + size ) { data_.resize( position_.bytes_ + size ); }
memcpy( data_.data() + position_.bytes_, srcBitstream.buffer() + position, size );
Expand Down