diff options
Diffstat (limited to 'libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch')
-rw-r--r-- | libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch | 342 |
1 files changed, 0 insertions, 342 deletions
diff --git a/libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch b/libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch deleted file mode 100644 index eb196ea16a..0000000000 --- a/libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch +++ /dev/null @@ -1,342 +0,0 @@ -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -545,7 +545,7 @@ static int decode_chunk_vbr(quicktime_t - - #if DECODE_AUDIO3 || DECODE_AUDIO4 - codec->pkt.data = codec->chunk_buffer; -- codec->pkt.size = packet_size + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE; - - #if DECODE_AUDIO4 - frame_bytes = avcodec_decode_audio4(codec->avctx, &f, -@@ -583,7 +583,7 @@ static int decode_chunk_vbr(quicktime_t - (codec->sample_buffer_end - codec->sample_buffer_start)], - &bytes_decoded, - codec->chunk_buffer, -- packet_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ packet_size + AV_INPUT_BUFFER_PADDING_SIZE); - if(frame_bytes < 0) - { - lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio2 error"); -@@ -645,13 +645,13 @@ static int decode_chunk(quicktime_t * fi - return 0; - } - -- if(codec->chunk_buffer_alloc < mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE) -+ if(codec->chunk_buffer_alloc < mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE) - { -- codec->chunk_buffer_alloc = mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->chunk_buffer_alloc = mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE; - codec->chunk_buffer = realloc(codec->chunk_buffer, codec->chunk_buffer_alloc); - } - memset(codec->chunk_buffer + codec->bytes_in_chunk_buffer, 0, -- mph.frame_bytes - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE); -+ mph.frame_bytes - codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE); - num_samples = mph.samples_per_frame; - codec->bytes_in_chunk_buffer = mph.frame_bytes; - } -@@ -695,7 +695,7 @@ static int decode_chunk(quicktime_t * fi - { - - -- /* BIG NOTE: We pass extra FF_INPUT_BUFFER_PADDING_SIZE for the buffer size -+ /* BIG NOTE: We pass extra AV_INPUT_BUFFER_PADDING_SIZE for the buffer size - because we know, that lqt_read_audio_chunk allocates 16 extra bytes for us */ - - /* Some really broken mp3 files have the header bytes split across 2 chunks */ -@@ -761,7 +761,7 @@ static int decode_chunk(quicktime_t * fi - - #if DECODE_AUDIO3 || DECODE_AUDIO4 - codec->pkt.data = &codec->chunk_buffer[bytes_used]; -- codec->pkt.size = codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->pkt.size = codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE; - - #if DECODE_AUDIO4 - -@@ -798,7 +798,7 @@ static int decode_chunk(quicktime_t * fi - (codec->sample_buffer_end - codec->sample_buffer_start)], - &bytes_decoded, - &codec->chunk_buffer[bytes_used], -- codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE); -+ codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE); - #endif - if(frame_bytes < 0) - { -@@ -838,7 +838,7 @@ static int decode_chunk(quicktime_t * fi - } - } - -- /* This happens because ffmpeg adds FF_INPUT_BUFFER_PADDING_SIZE to the bytes returned */ -+ /* This happens because ffmpeg adds AV_INPUT_BUFFER_PADDING_SIZE to the bytes returned */ - - if(codec->bytes_in_chunk_buffer < 0) - codec->bytes_in_chunk_buffer = 0; -Index: libquicktime-1.2.4/plugins/ffmpeg/params.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c -+++ libquicktime-1.2.4/plugins/ffmpeg/params.c -@@ -124,16 +124,6 @@ typedef struct - } - - --enum_t me_method[] = -- { -- { "Zero", ME_ZERO }, -- { "Phods", ME_PHODS }, -- { "Log", ME_LOG }, -- { "X1", ME_X1 }, -- { "Epzs", ME_EPZS }, -- { "Full", ME_FULL } -- }; -- - enum_t prediction_method[] = - { - { "Left", FF_PRED_LEFT }, -@@ -163,15 +153,6 @@ enum_t mb_decision[] = - { "Rate distoration", FF_MB_DECISION_RD } - }; - --enum_t coder_type[] = -- { -- { "VLC", FF_CODER_TYPE_VLC }, -- { "Arithmetic", FF_CODER_TYPE_AC }, -- { "Raw", FF_CODER_TYPE_RAW }, -- { "RLE", FF_CODER_TYPE_RLE }, -- { "Deflate", FF_CODER_TYPE_DEFLATE }, -- }; -- - #define PARAM_ENUM(name, var, arr) \ - if(!strcasecmp(key, name)) \ - { \ -@@ -203,7 +184,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT_SCALE("ff_bit_rate_audio",bit_rate,1000); - PARAM_INT_SCALE("ff_bit_rate_video",bit_rate,1000); - PARAM_INT_SCALE("ff_bit_rate_tolerance",bit_rate_tolerance,1000); -- PARAM_ENUM("ff_me_method",me_method,me_method); -+ PARAM_DICT_INT("ff_me_method","motion-est"); - PARAM_INT("ff_gop_size",gop_size); - PARAM_FLOAT("ff_qcompress",qcompress); - PARAM_FLOAT("ff_qblur",qblur); -@@ -227,10 +208,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_rc_min_rate",rc_min_rate); - PARAM_INT("ff_rc_max_rate",rc_max_rate); - PARAM_INT_SCALE("ff_rc_buffer_size",rc_buffer_size,1000); -- PARAM_FLOAT("ff_rc_buffer_aggressivity",rc_buffer_aggressivity); - PARAM_FLOAT("ff_i_quant_factor",i_quant_factor); - PARAM_QP2LAMBDA("ff_i_quant_offset",i_quant_offset); -- PARAM_FLOAT("ff_rc_initial_cplx",rc_initial_cplx); -+ PARAM_DICT_INT("ff_rc_initial_cplx","rc_init_cplx"); - PARAM_FLOAT("ff_lumi_masking",lumi_masking); - PARAM_FLOAT("ff_temporal_cplx_masking",temporal_cplx_masking); - PARAM_FLOAT("ff_spatial_cplx_masking",spatial_cplx_masking); -@@ -255,8 +235,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_me_range",me_range); - PARAM_ENUM("ff_mb_decision",mb_decision,mb_decision); - PARAM_INT("ff_scenechange_threshold",scenechange_threshold); -- PARAM_QP2LAMBDA("ff_lmin", lmin); -- PARAM_QP2LAMBDA("ff_lmax", lmax); -+ PARAM_DICT_INT("ff_lmin", "lmin"); -+ PARAM_DICT_INT("ff_lmax", "lmax"); - PARAM_INT("ff_noise_reduction",noise_reduction); - PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); - -@@ -269,33 +249,29 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - #endif - - PARAM_INT("ff_thread_count",thread_count); -- PARAM_INT("ff_me_threshold",me_threshold); -- PARAM_INT("ff_mb_threshold",mb_threshold); - PARAM_INT("ff_nsse_weight",nsse_weight); -- PARAM_FLOAT("ff_border_masking",border_masking); -+ PARAM_DICT_INT("ff_border_masking","border_mask"); - PARAM_QP2LAMBDA("ff_mb_lmin", mb_lmin); - PARAM_QP2LAMBDA("ff_mb_lmax", mb_lmax); - PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation); - PARAM_INT("ff_bidir_refine",bidir_refine); - PARAM_INT("ff_brd_scale",brd_scale); -- PARAM_INT("ff_scenechange_factor",scenechange_factor); -- PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE); -- PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV); -- PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL); -- PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC); -- PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0); -+ PARAM_FLAG("ff_flag_qscale",AV_CODEC_FLAG_QSCALE); -+ PARAM_FLAG("ff_flag_4mv",AV_CODEC_FLAG_4MV); -+ PARAM_FLAG("ff_flag_qpel",AV_CODEC_FLAG_QPEL); -+ PARAM_DICT_FLAG("ff_flag_gmc","gmc"); -+ PARAM_DICT_FLAG("ff_flag_mv0","mpv_flags"); - // PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused -- PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY); -- PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE); -- PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP); -+ PARAM_FLAG("ff_flag_gray",AV_CODEC_FLAG_GRAY); -+ PARAM_DICT_FLAG("ff_flag_normalize_aqp","naq"); - // PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - PARAM_FLAG("ff_flag_trellis_quant",CODEC_FLAG_TRELLIS_QUANT); - #else - PARAM_INT("ff_trellis",trellis); - #endif -- PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); -- PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); -+ PARAM_FLAG("ff_flag_bitexact",AV_CODEC_FLAG_BITEXACT); -+ PARAM_FLAG("ff_flag_ac_pred",AV_CODEC_FLAG_AC_PRED); - // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused - - #if LIBAVCODEC_VERSION_MAJOR >= 55 -@@ -303,9 +279,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); - PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); - #else -- PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); -- PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); -- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); -+ PARAM_FLAG("ff_flag_cbp_rd",AV_CODEC_FLAG_CBP_RD); -+ PARAM_FLAG("ff_flag_qp_rd",AV_CODEC_FLAG_QP_RD); -+ PARAM_FLAG2("ff_flag2_strict_gop",AV_CODEC_FLAG2_STRICT_GOP); - #endif - - #if LIBAVCODEC_VERSION_MAJOR >= 54 -@@ -313,14 +289,14 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_DICT_FLAG("ff_flag_obmc","obmc"); - PARAM_DICT_FLAG("ff_flag_h263p_slice_struct","structured_slices"); - #else -- PARAM_FLAG("ff_flag_h263p_aiv",CODEC_FLAG_H263P_AIV); -- PARAM_FLAG("ff_flag_obmc",CODEC_FLAG_OBMC); -- PARAM_FLAG("ff_flag_h263p_slice_struct",CODEC_FLAG_H263P_SLICE_STRUCT); -+ PARAM_FLAG("ff_flag_h263p_aiv",AV_CODEC_FLAG_H263P_AIV); -+ PARAM_FLAG("ff_flag_obmc",AV_CODEC_FLAG_OBMC); -+ PARAM_FLAG("ff_flag_h263p_slice_struct",AV_CODEC_FLAG_H263P_SLICE_STRUCT); - #endif - -- PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); -- PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); -- PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); -- PARAM_ENUM("ff_coder_type",coder_type,coder_type); -+ PARAM_FLAG("ff_flag_loop_filter",AV_CODEC_FLAG_LOOP_FILTER); -+ PARAM_FLAG("ff_flag_closed_gop",AV_CODEC_FLAG_CLOSED_GOP); -+ PARAM_FLAG2("ff_flag2_fast",AV_CODEC_FLAG2_FAST); -+ PARAM_DICT_INT("ff_coder_type","coder"); - - } -Index: libquicktime-1.2.4/plugins/ffmpeg/params.h -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h -+++ libquicktime-1.2.4/plugins/ffmpeg/params.h -@@ -149,7 +149,7 @@ the reference. Unused for constant quant - .type = LQT_PARAMETER_INT, \ - .val_default = { .val_int = 0 }, \ - .val_min = { .val_int = 0 }, \ -- .val_max = { .val_int = FF_MAX_B_FRAMES }, \ -+ .val_max = { .val_int = 16 }, \ - .help_string = TRS("Maximum number of B-frames between non B-frames") \ - } - -Index: libquicktime-1.2.4/plugins/ffmpeg/video.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c -@@ -781,7 +781,7 @@ static int lqt_ffmpeg_decode_video(quick - if(extradata) - { - codec->extradata = -- calloc(1, extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ calloc(1, extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); - memcpy(codec->extradata, extradata, extradata_size); - codec->avctx->extradata_size = extradata_size; - codec->avctx->extradata = codec->extradata; -@@ -1140,8 +1140,8 @@ static int init_imx_encoder(quicktime_t - codec->avctx->qmin = 1; - codec->avctx->qmax = 3; - codec->avctx->rtp_payload_size = 1; // ?? -- codec->avctx->rc_buffer_aggressivity = 0.25; -- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY; -+ av_dict_set(&codec->options, "rc_buf_aggressivity", "0.25", 0); -+ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_LOW_DELAY; - - #if (LIBAVCODEC_VERSION_MAJOR < 54) - codec->avctx->flags2 |= CODEC_FLAG2_INTRA_VLC|CODEC_FLAG2_NON_LINEAR_QUANT; -@@ -1328,7 +1328,7 @@ static int lqt_ffmpeg_encode_video(quick - // codec->avctx->time_base.den = 1; - // codec->avctx->time_base.num = lqt_video_time_scale(file, track); - -- if(codec->avctx->flags & CODEC_FLAG_QSCALE) -+ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE) - codec->avctx->global_quality = codec->qscale; - - codec->avctx->width = width; -@@ -1344,7 +1344,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - codec->write_global_header = 1; - } - -@@ -1360,7 +1360,7 @@ static int lqt_ffmpeg_encode_video(quick - { - lqt_log(file, LQT_LOG_INFO, LOG_DOMAIN, "Enabling interlaced encoding"); - codec->avctx->flags |= -- (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN); -+ (AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME|AV_CODEC_FLAG_ALT_SCAN); - } - #endif - } -@@ -1387,7 +1387,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - codec->write_global_header = 1; - } - } -@@ -1410,7 +1410,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) - { -- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT; -+ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT; - } - } - else if(codec->is_imx) -@@ -1422,7 +1422,7 @@ static int lqt_ffmpeg_encode_video(quick - if(codec->pass == 1) - { - codec->stats_file = fopen(codec->stats_filename, "w"); -- codec->avctx->flags |= CODEC_FLAG_PASS1; -+ codec->avctx->flags |= AV_CODEC_FLAG_PASS1; - } - else if(codec->pass == codec->total_passes) - { -@@ -1438,7 +1438,7 @@ static int lqt_ffmpeg_encode_video(quick - fclose(codec->stats_file); - codec->stats_file = (FILE*)0; - -- codec->avctx->flags |= CODEC_FLAG_PASS2; -+ codec->avctx->flags |= AV_CODEC_FLAG_PASS2; - } - } - /* Open codec */ -@@ -1516,7 +1516,7 @@ static int lqt_ffmpeg_encode_video(quick - } - - codec->frame->pts = vtrack->timestamp; -- if(codec->avctx->flags & CODEC_FLAG_QSCALE) -+ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE) - codec->frame->quality = codec->qscale; - #ifdef DO_INTERLACE - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) -@@ -1599,8 +1599,7 @@ static int lqt_ffmpeg_encode_video(quick - else if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - int advanced = 0; -- if(codec->avctx->max_b_frames || -- (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC))) -+ if(codec->avctx->max_b_frames) - advanced = 1; - - setup_header_mpeg4(file, track, codec->avctx->extradata, |