June 2015 - ffmpeg-cvslog - lists.ffmpeg.org

ffmpeg: windows: respond to logoff and ctrl+break messages as well
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | rogerdpack <rogerpack2005(a)gmail.com> | Tue Jun 30 16:31:19 2015 -0600| [4ebb43f19c416e1601730ca9ae57749b1385c563] | committer: Michael Niedermayer ffmpeg: windows: respond to logoff and ctrl+break messages as well Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ebb43f19c416e160… --- configure | 2 ++ ffmpeg.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/configure b/configure index 89b5668..cc23991 100755 --- a/configure +++ b/configure @@ -1787,6 +1787,7 @@ SYSTEM_FUNCS=" pthread_cancel sched_getaffinity SetConsoleTextAttribute + SetConsoleCtrlHandler setmode setrlimit Sleep @@ -4990,6 +4991,7 @@ check_func_headers windows.h GetSystemTimeAsFileTime check_func_headers windows.h MapViewOfFile check_func_headers windows.h PeekNamedPipe check_func_headers windows.h SetConsoleTextAttribute +check_func_headers windows.h SetConsoleCtrlHandler check_func_headers windows.h Sleep check_func_headers windows.h VirtualAlloc check_struct windows.h "CONDITION_VARIABLE" Ptr diff --git a/ffmpeg.c b/ffmpeg.c index 37f096c..e592629 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -79,6 +79,10 @@ #include <windows.h> #include <psapi.h> #endif +#if HAVE_SETCONSOLECTRLHANDLER +#include <windows.h> +#endif + #if HAVE_SYS_SELECT_H #include <sys/select.h> @@ -313,6 +317,7 @@ void term_exit(void) static volatile int received_sigterm = 0; static volatile int received_nb_signals = 0; static volatile int transcode_init_done = 0; +static volatile int ffmpeg_exited = 0; static int main_return_code = 0; static void @@ -329,6 +334,38 @@ sigterm_handler(int sig) } } +#if HAVE_SETCONSOLECTRLHANDLER +static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) +{ + av_log(NULL, AV_LOG_DEBUG, "\nReceived windows signal %ld\n", fdwCtrlType); + + switch (fdwCtrlType) + { + case CTRL_C_EVENT: + case CTRL_BREAK_EVENT: + sigterm_handler(SIGINT); + return TRUE; + + case CTRL_CLOSE_EVENT: + case CTRL_LOGOFF_EVENT: + case CTRL_SHUTDOWN_EVENT: + sigterm_handler(SIGTERM); + /* Basically, with these 3 events, when we return from this method the + process is hard terminated, so stall as long as we need to + to try and let the main thread(s) clean up and gracefully terminate + (we have at most 5 seconds, but should be done far before that). */ + while (!ffmpeg_exited) { + Sleep(0); + } + return TRUE; + + default: + av_log(NULL, AV_LOG_ERROR, "Received unknown windows signal %ld\n", fdwCtrlType); + return FALSE; + } +} +#endif + void term_init(void) { #if HAVE_TERMIOS_H @@ -362,6 +399,9 @@ void term_init(void) #ifdef SIGXCPU signal(SIGXCPU, sigterm_handler); #endif +#if HAVE_SETCONSOLECTRLHANDLER + SetConsoleCtrlHandler((PHANDLER_ROUTINE) CtrlHandler, TRUE); +#endif } /* read a key without blocking */ @@ -537,6 +577,7 @@ static void ffmpeg_cleanup(int ret) av_log(NULL, AV_LOG_INFO, "Conversion failed!\n"); } term_exit(); + ffmpeg_exited = 1; } void remove_avoptions(AVDictionary **a, AVDictionary *b)

1 0

ffmpeg: only count got_output/errors in decode_error_stat
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Tue Jun 30 21:09:50 2015 +0200| [bd0f14123fd8c7ff1c27b726d143f84c67f3a522] | committer: Andreas Cadhalpun ffmpeg: only count got_output/errors in decode_error_stat If threading is used, the first (thread_count - 1) packets are read before any frame/error is returned. Counting this as successful decoding is wrong, because it also happens when no single frame could be decoded. Reviewed-by: Michael Niedermayer <michaelni(a)gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd0f14123fd8c7ff1… --- ffmpeg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index e3d0cc4..37f096c 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1870,7 +1870,7 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output) ret = AVERROR_INVALIDDATA; } - if (*got_output || ret<0 || pkt->size) + if (*got_output || ret<0) decode_error_stat[ret<0] ++; if (ret < 0 && exit_on_error) @@ -2009,7 +2009,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output) ); } - if (*got_output || ret<0 || pkt->size) + if (*got_output || ret<0) decode_error_stat[ret<0] ++; if (ret < 0 && exit_on_error) @@ -2121,7 +2121,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output) int i, ret = avcodec_decode_subtitle2(ist->dec_ctx, &subtitle, got_output, pkt); - if (*got_output || ret<0 || pkt->size) + if (*got_output || ret<0) decode_error_stat[ret<0] ++; if (ret < 0 && exit_on_error)

1 0

ffmpeg: exit_on_error if decoding a packet failed
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Tue Jun 30 21:06:40 2015 +0200| [cd64ead8d96b2d2c300e0ac620fb82b17d6051bf] | committer: Andreas Cadhalpun ffmpeg: exit_on_error if decoding a packet failed This is the second part of the fix for ticket #4370. Reviewed-by: Michael Niedermayer <michaelni(a)gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd64ead8d96b2d2c3… --- ffmpeg.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ffmpeg.c b/ffmpeg.c index aac03bb..e3d0cc4 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1873,6 +1873,9 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output) if (*got_output || ret<0 || pkt->size) decode_error_stat[ret<0] ++; + if (ret < 0 && exit_on_error) + exit_program(1); + if (!*got_output || ret < 0) return ret; @@ -2009,6 +2012,9 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output) if (*got_output || ret<0 || pkt->size) decode_error_stat[ret<0] ++; + if (ret < 0 && exit_on_error) + exit_program(1); + if (*got_output && ret >= 0) { if (ist->dec_ctx->width != decoded_frame->width || ist->dec_ctx->height != decoded_frame->height || @@ -2118,6 +2124,9 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output) if (*got_output || ret<0 || pkt->size) decode_error_stat[ret<0] ++; + if (ret < 0 && exit_on_error) + exit_program(1); + if (ret < 0 || !*got_output) { if (!pkt->size) sub2video_flush(ist);

1 0

pthread_frame: forward error codes when flushing
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Tue Jun 30 21:01:29 2015 +0200| [32a5b631267e1f8bf279e407039b9a99d012d033] | committer: Andreas Cadhalpun pthread_frame: forward error codes when flushing This is the first part of the fix for ticket #4370. Reviewed-by: Michael Niedermayer <michaelni(a)gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32a5b631267e1f8bf… --- libavcodec/pthread_frame.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index a3fd1ff..d48ee33 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -454,6 +454,9 @@ int ff_thread_decode_frame(AVCodecContext *avctx, *got_picture_ptr = p->got_frame; picture->pkt_dts = p->avpkt.dts; + if (p->result < 0) + err = p->result; + /* * A later call with avkpt->size == 0 may loop over all threads, * including this one, searching for a frame to return before being @@ -471,6 +474,14 @@ int ff_thread_decode_frame(AVCodecContext *avctx, fctx->next_finished = finished; + /* + * When no frame was found while flushing, but an error occured in + * any thread, return it instead of 0. + * Otherwise the error can get lost. + */ + if (!avpkt->size && !*got_picture_ptr) + return err; + /* return the size of the consumed packet if no error occurred */ return (p->result >= 0) ? avpkt->size : p->result; }

1 0

avcodec/h264: Greenmetadata SEI parsing
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Nicolas DEROUINEAU <nicolas.derouineau(a)vitec.com> | Tue Jun 30 15:17:59 2015 +0200| [04a68f43488c2b6796f1e24c87122f814b785e88] | committer: Michael Niedermayer avcodec/h264: Greenmetadata SEI parsing Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04a68f43488c2b679… --- doc/codecs.texi | 3 +++ libavcodec/avcodec.h | 1 + libavcodec/h264.h | 21 +++++++++++++++ libavcodec/h264_sei.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ libavcodec/options_table.h | 1 + 5 files changed, 89 insertions(+) diff --git a/doc/codecs.texi b/doc/codecs.texi index 3c035a5..a2aa503 100644 --- a/doc/codecs.texi +++ b/doc/codecs.texi @@ -475,6 +475,9 @@ per-block quantization parameter (QP) motion vector @item dct_coeff +@item green_metadata +display complexity metadata for the upcoming frame, GoP or for a given duration. + @item skip @item startcode diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ddbf0a3..6391cf3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2616,6 +2616,7 @@ typedef struct AVCodecContext { #endif #define FF_DEBUG_BUFFERS 0x00008000 #define FF_DEBUG_THREADS 0x00010000 +#define FF_DEBUG_GREEN_MD 0x00800000 #define FF_DEBUG_NOMC 0x01000000 #if FF_API_DEBUG_MV diff --git a/libavcodec/h264.h b/libavcodec/h264.h index f0d569b..edecc4b 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -137,6 +137,7 @@ typedef enum { SEI_TYPE_RECOVERY_POINT = 6, ///< recovery point (frame # to decoder sync) SEI_TYPE_FRAME_PACKING = 45, ///< frame packing arrangement SEI_TYPE_DISPLAY_ORIENTATION = 47, ///< display orientation + SEI_TYPE_GREEN_METADATA = 56 ///< GreenMPEG information } SEI_Type; /** @@ -268,6 +269,22 @@ typedef struct FPA { } FPA; /** + * Green MetaData Information Type + */ +typedef struct GreenMetaData { + uint8_t green_metadata_type; + uint8_t period_type; + uint16_t num_seconds; + uint16_t num_pictures; + uint8_t percent_non_zero_macroblocks; + uint8_t percent_intra_coded_macroblocks; + uint8_t percent_six_tap_filtering; + uint8_t percent_alpha_point_deblocking_instance; + uint8_t xsd_metric_type; + uint16_t xsd_metric_value; +} GreenMetaData; + +/** * Memory management control operation opcode. */ typedef enum MMCOOpcode { @@ -817,6 +834,10 @@ typedef struct H264Context { /* Motion Estimation */ qpel_mc_func (*qpel_put)[16]; qpel_mc_func (*qpel_avg)[16]; + + /*Green Metadata */ + GreenMetaData sei_green_metadata; + } H264Context; extern const uint8_t ff_h264_chroma_qp[7][QP_MAX_NUM + 1]; ///< One chroma qp table for each possible bit depth (8-14). diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 2bce67a..569db4e 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -294,6 +294,66 @@ static int decode_display_orientation(H264Context *h) return 0; } +static int decode_GreenMetadata(H264Context *h) +{ + if (h->avctx->debug & FF_DEBUG_GREEN_MD) + av_log(h->avctx, AV_LOG_DEBUG, "Green Metadata Info SEI message\n"); + + h->sei_green_metadata.green_metadata_type=get_bits(&h->gb, 8); + + if (h->avctx->debug & FF_DEBUG_GREEN_MD) + av_log(h->avctx, AV_LOG_DEBUG, "green_metadata_type = %d\n", + h->sei_green_metadata.green_metadata_type); + + if (h->sei_green_metadata.green_metadata_type==0){ + h->sei_green_metadata.period_type=get_bits(&h->gb, 8); + + if (h->avctx->debug & FF_DEBUG_GREEN_MD) + av_log(h->avctx, AV_LOG_DEBUG, "green_metadata_period_type = %d\n", + h->sei_green_metadata.period_type); + + if (h->sei_green_metadata.green_metadata_type==2){ + h->sei_green_metadata.num_seconds = get_bits(&h->gb, 16); + if (h->avctx->debug & FF_DEBUG_GREEN_MD) + av_log(h->avctx, AV_LOG_DEBUG, "green_metadata_num_seconds = %d\n", + h->sei_green_metadata.num_seconds); + } + else if (h->sei_green_metadata.period_type==3){ + h->sei_green_metadata.num_pictures = get_bits(&h->gb, 16); + if (h->avctx->debug & FF_DEBUG_GREEN_MD) + av_log(h->avctx, AV_LOG_DEBUG, "green_metadata_num_pictures = %d\n", + h->sei_green_metadata.num_pictures); + } + + h->sei_green_metadata.percent_non_zero_macroblocks=get_bits(&h->gb, 8); + h->sei_green_metadata.percent_intra_coded_macroblocks=get_bits(&h->gb, 8); + h->sei_green_metadata.percent_six_tap_filtering=get_bits(&h->gb, 8); + h->sei_green_metadata.percent_alpha_point_deblocking_instance=get_bits(&h->gb, 8); + + if (h->avctx->debug & FF_DEBUG_GREEN_MD) + av_log(h->avctx, AV_LOG_DEBUG, "SEI GREEN Complexity Metrics = %f %f %f %f\n", + (float)h->sei_green_metadata.percent_non_zero_macroblocks/255, + (float)h->sei_green_metadata.percent_intra_coded_macroblocks/255, + (float)h->sei_green_metadata.percent_six_tap_filtering/255, + (float)h->sei_green_metadata.percent_alpha_point_deblocking_instance/255); + + }else if( h->sei_green_metadata.green_metadata_type==1){ + h->sei_green_metadata.xsd_metric_type=get_bits(&h->gb, 8); + h->sei_green_metadata.xsd_metric_value=get_bits(&h->gb, 16); + + if (h->avctx->debug & FF_DEBUG_GREEN_MD) + av_log(h->avctx, AV_LOG_DEBUG, "xsd_metric_type = %d\n", + h->sei_green_metadata.xsd_metric_type); + if ( h->sei_green_metadata.xsd_metric_type==0){ + if (h->avctx->debug & FF_DEBUG_GREEN_MD) + av_log(h->avctx, AV_LOG_DEBUG, "xsd_metric_value = %f\n", + (float)h->sei_green_metadata.xsd_metric_value/100); + } + } + + return 0; +} + int ff_h264_decode_sei(H264Context *h) { while (get_bits_left(&h->gb) > 16 && show_bits(&h->gb, 16)) { @@ -346,6 +406,9 @@ int ff_h264_decode_sei(H264Context *h) case SEI_TYPE_DISPLAY_ORIENTATION: ret = decode_display_orientation(h); break; + case SEI_TYPE_GREEN_METADATA: + ret = decode_GreenMetadata(h); + break; default: av_log(h->avctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type); } diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index a906864..76ae81f 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -253,6 +253,7 @@ static const AVOption avcodec_options[] = { {"mv", "motion vector", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_MV }, INT_MIN, INT_MAX, V|D, "debug"}, #endif {"dct_coeff", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_DCT_COEFF }, INT_MIN, INT_MAX, V|D, "debug"}, +{"green_metadata", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_GREEN_MD }, INT_MIN, INT_MAX, V|D, "debug"}, {"skip", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_SKIP }, INT_MIN, INT_MAX, V|D, "debug"}, {"startcode", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DEBUG_STARTCODE }, INT_MIN, INT_MAX, V|D, "debug"}, #if FF_API_UNUSED_MEMBERS

1 0

Merge commit '271ce76d317c5432e151216cf23f12b77ed6cb7e'
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 22:51:19 2015 +0200| [7e9c7b623f051eea2e9565a260dae071f873cb42] | committer: Michael Niedermayer Merge commit '271ce76d317c5432e151216cf23f12b77ed6cb7e' * commit '271ce76d317c5432e151216cf23f12b77ed6cb7e': h264: Parse registered data SEI message and AFD value Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_sei.c libavcodec/version.h See: d6e95669496a89d186f923c34bcaf7d86b7cd59c See: 22291c372fa703242e8429bed61700ba81258f19 Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e9c7b623f051eea2… ---

1 0

h264: Parse registered data SEI message and AFD value
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Sun Jun 28 12:13:05 2015 +0200| [271ce76d317c5432e151216cf23f12b77ed6cb7e] | committer: Vittorio Giovara h264: Parse registered data SEI message and AFD value Partially based on code by Marton Balint and Kieran Kunhya. Signed-off-by: Vittorio Giovara <vittorio.giovara(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=271ce76d317c5432e… --- libavcodec/h264.c | 10 ++++++++++ libavcodec/h264.h | 7 +++++++ libavcodec/h264_sei.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 4 files changed, 67 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 6fd238d..6925a8a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -822,6 +822,16 @@ static void decode_postinit(H264Context *h, int setup_finished) h->sei_hflip, h->sei_vflip); } + if (h->sei_reguserdata_afd_present) { + AVFrameSideData *sd = av_frame_new_side_data(cur->f, AV_FRAME_DATA_AFD, + sizeof(uint8_t)); + if (!sd) + return; + + *sd->data = h->active_format_description; + h->sei_reguserdata_afd_present = 0; + } + // FIXME do something with unavailable reference frames /* Sort B-frames into display order */ diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 6712c7e..49bd464 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -129,6 +129,7 @@ enum { typedef enum { SEI_TYPE_BUFFERING_PERIOD = 0, ///< buffering period (H.264, D.1.1) SEI_TYPE_PIC_TIMING = 1, ///< picture timing + SEI_TYPE_USER_DATA_REGISTERED = 4, ///< registered user data as specified by Rec. ITU-T T.35 SEI_TYPE_USER_DATA_UNREGISTERED = 5, ///< unregistered user data SEI_TYPE_RECOVERY_POINT = 6, ///< recovery point (frame # to decoder sync) SEI_TYPE_FRAME_PACKING = 45, ///< frame packing arrangement @@ -675,6 +676,12 @@ typedef struct H264Context { int sei_hflip, sei_vflip; /** + * User data registered by Rec. ITU-T T.35 SEI + */ + int sei_reguserdata_afd_present; + uint8_t active_format_description; + + /** * Bit set of clock types for fields/frames in picture timing SEI message. * For each found ct_type, appropriate bit is set (e.g., bit 1 for * interlaced). diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 0e99f05..fe85ef1 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -42,6 +42,7 @@ void ff_h264_reset_sei(H264Context *h) h->sei_buffering_period_present = 0; h->sei_frame_packing_present = 0; h->sei_display_orientation_present = 0; + h->sei_reguserdata_afd_present = 0; } static int decode_picture_timing(H264Context *h) @@ -102,6 +103,51 @@ static int decode_picture_timing(H264Context *h) return 0; } +static int decode_registered_user_data(H264Context *h, int size) +{ + uint32_t country_code; + uint32_t user_identifier; + int flag; + + if (size < 7) + return AVERROR_INVALIDDATA; + size -= 7; + + country_code = get_bits(&h->gb, 8); // itu_t_t35_country_code + if (country_code == 0xFF) { + skip_bits(&h->gb, 8); // itu_t_t35_country_code_extension_byte + size--; + } + + /* itu_t_t35_payload_byte follows */ + skip_bits(&h->gb, 8); // terminal provider code + skip_bits(&h->gb, 8); // terminal provider oriented code + user_identifier = get_bits_long(&h->gb, 32); + + switch (user_identifier) { + case MKBETAG('D', 'T', 'G', '1'): // afd_data + if (size-- < 1) + return AVERROR_INVALIDDATA; + skip_bits(&h->gb, 1); // 0 + flag = get_bits(&h->gb, 1); // active_format_flag + skip_bits(&h->gb, 6); // reserved + + if (flag) { + if (size-- < 1) + return AVERROR_INVALIDDATA; + skip_bits(&h->gb, 4); // reserved + h->active_format_description = get_bits(&h->gb, 4); + h->sei_reguserdata_afd_present = 1; + } + break; + default: + skip_bits(&h->gb, size * 8); + break; + } + + return 0; +} + static int decode_unregistered_user_data(H264Context *h, int size) { uint8_t user_data[16 + 256]; @@ -247,6 +293,9 @@ int ff_h264_decode_sei(H264Context *h) case SEI_TYPE_PIC_TIMING: // Picture timing SEI ret = decode_picture_timing(h); break; + case SEI_TYPE_USER_DATA_REGISTERED: + ret = decode_registered_user_data(h, size); + break; case SEI_TYPE_USER_DATA_UNREGISTERED: ret = decode_unregistered_user_data(h, size); break; diff --git a/libavcodec/version.h b/libavcodec/version.h index f043b3f..b0643cc 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 56 #define LIBAVCODEC_VERSION_MINOR 29 -#define LIBAVCODEC_VERSION_MICRO 0 +#define LIBAVCODEC_VERSION_MICRO 1 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \

1 0

Merge commit '0bfab80a0d9fce0180e8aa2a947267f89b725091'
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 22:29:34 2015 +0200| [8e6c5c4322367ab066bbb0134eac5ee9c1aafdc3] | committer: Michael Niedermayer Merge commit '0bfab80a0d9fce0180e8aa2a947267f89b725091' * commit '0bfab80a0d9fce0180e8aa2a947267f89b725091': h264_sei: Group error check outside the switch block Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e6c5c4322367ab06… ---

1 0

h264_sei: Group error check outside the switch block
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Sun Jun 28 02:05:04 2015 +0200| [0bfab80a0d9fce0180e8aa2a947267f89b725091] | committer: Vittorio Giovara h264_sei: Group error check outside the switch block > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bfab80a0d9fce018… --- libavcodec/h264_sei.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 52ff2ff..0e99f05 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -246,38 +246,28 @@ int ff_h264_decode_sei(H264Context *h) switch (type) { case SEI_TYPE_PIC_TIMING: // Picture timing SEI ret = decode_picture_timing(h); - if (ret < 0) - return ret; break; case SEI_TYPE_USER_DATA_UNREGISTERED: ret = decode_unregistered_user_data(h, size); - if (ret < 0) - return ret; break; case SEI_TYPE_RECOVERY_POINT: ret = decode_recovery_point(h); - if (ret < 0) - return ret; break; case SEI_TYPE_BUFFERING_PERIOD: ret = decode_buffering_period(h); - if (ret < 0) - return ret; break; case SEI_TYPE_FRAME_PACKING: ret = decode_frame_packing_arrangement(h); - if (ret < 0) - return ret; break; case SEI_TYPE_DISPLAY_ORIENTATION: ret = decode_display_orientation(h); - if (ret < 0) - return ret; break; default: av_log(h->avctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type); skip_bits(&h->gb, 8 * size); } + if (ret < 0) + return ret; // FIXME check bits here align_get_bits(&h->gb);

1 0

Merge commit '0a49a62f998747cfa564d98d36a459fe70d3299b'
by git＠videolan.org 30 Jun '15

30 Jun '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Jun 30 22:13:50 2015 +0200| [2a227fe8799e26fe3c8862438a163f72dca017a5] | committer: Michael Niedermayer Merge commit '0a49a62f998747cfa564d98d36a459fe70d3299b' * commit '0a49a62f998747cfa564d98d36a459fe70d3299b': h263: Always check both dimensions Conflicts: libavcodec/ituh263dec.c See: 62006b539ddda23594febf0fcb2f21c03de60457 Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a227fe8799e26fe3… ---

1 0