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

update ffmpeg to 4.4.2 #37

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

update ffmpeg to 4.4.2 #37

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
3 changes: 3 additions & 0 deletions include/mediastreamer2/msqueue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ static MS2_INLINE bool_t ms_queue_end(const MSQueue *q, const mblk_t *m){
}

static MS2_INLINE mblk_t *ms_queue_peek_next(MSQueue *q, mblk_t *cur){
if (q)
return cur->b_next;

return cur->b_next;
}

Expand Down
1 change: 1 addition & 0 deletions src/videofilters/h264dec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ static void dec_open(DecData *d){
}

static void dec_init(MSFilter *f){
ms_message("ffmpeg's h264 decoder");
DecData *d=ms_new0(DecData,1);
ffmpeg_init();
d->sps=NULL;
Expand Down
2 changes: 1 addition & 1 deletion src/voip/h26x/videotoolbox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ extern "C" void _register_videotoolbox_if_supported(MSFactory *factory) {
if (codecInfo->encoderIsAvailable()) {
ms_message("Registering VideoToolbox H264 codec");
ms_factory_register_filter(factory, &ms_VideoToolboxH264Encoder_desc);
ms_factory_register_filter(factory, &ms_VideoToolboxH264Decoder_desc);
// ms_factory_register_filter(factory, &ms_VideoToolboxH264Decoder_desc);
} else {
ms_message("No H264 encoder found on this device");
}
Expand Down
4 changes: 2 additions & 2 deletions src/voip/msvoip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,13 +272,13 @@ void ms_factory_init_voip(MSFactory *obj){
#endif

#if defined(__APPLE__) && defined(VIDEO_ENABLED)
_register_videotoolbox_if_supported(obj);
_register_videotoolbox_if_supported(obj);
#endif

#if defined(__ANDROID__) && defined(VIDEO_ENABLED)
if (AMediaImage_isAvailable()) {
if (AMediaCodec_checkCodecAvailability("video/avc")) {
ms_factory_register_filter(obj, &ms_MediaCodecH264Decoder_desc);
// ms_factory_register_filter(obj, &ms_MediaCodecH264Decoder_desc);
ms_factory_register_filter(obj, &ms_MediaCodecH264Encoder_desc);
}
if (AMediaCodec_checkCodecAvailability("video/hevc")) {
Expand Down