mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/ffmpeg/: Add G_PARAM_STATIC_STRINGS to avoid numerous strcpy calls.

Browse source 
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcfg.c: (gst_ffmpeg_cfg_init):
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_class_init),
(gst_ffmpegdec_init), (gst_ffmpegdec_setcaps),
(gst_ffmpegdec_get_buffer), (get_output_buffer),
(gst_ffmpegdec_set_property), (gst_ffmpegdec_get_property):
Add G_PARAM_STATIC_STRINGS to avoid numerous strcpy calls.
This commit is contained in:
Wim Taymans 2008-11-06 11:47:40 +00:00
parent fe4e398482
commit 4ad12e4818
3 changed files with 149 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-11-06 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/ffmpeg/gstffmpegcfg.c: (gst_ffmpeg_cfg_init):
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_class_init),
(gst_ffmpegdec_init), (gst_ffmpegdec_setcaps),
(gst_ffmpegdec_get_buffer), (get_output_buffer),
(gst_ffmpegdec_set_property), (gst_ffmpegdec_get_property):
Add G_PARAM_STATIC_STRINGS to avoid numerous strcpy calls.
2008-11-05 Wim Taymans <wim.taymans@collabora.co.uk> 2008-11-05 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_setcaps), * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_setcaps),

156
ext/ffmpeg/gstffmpegcfg.c
View file

@ -387,289 +387,325 @@ gst_ffmpeg_cfg_init ()
/* list properties here */ /* list properties here */
pspec = g_param_spec_enum ("pass", "Encoding pass/type", pspec = g_param_spec_enum ("pass", "Encoding pass/type",
"Encoding pass/type", GST_TYPE_FFMPEG_PASS, 0, G_PARAM_READWRITE); "Encoding pass/type", GST_TYPE_FFMPEG_PASS, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, pass, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, pass, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("quantizer", "Constant Quantizer", pspec = g_param_spec_float ("quantizer", "Constant Quantizer",
"Constant Quantizer", 0, 30, 0.01f, G_PARAM_READWRITE); "Constant Quantizer", 0, 30, 0.01f,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, quantizer, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, quantizer, FALSE, mpeg, NULL);
pspec = g_param_spec_string ("statsfile", "Statistics Filename", pspec = g_param_spec_string ("statsfile", "Statistics Filename",
"Filename to store data for 2-pass encoding", "stats.log", "Filename to store data for 2-pass encoding", "stats.log",
G_PARAM_READWRITE); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, filename, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, filename, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("bitrate-tolerance", "Bitrate Tolerance", pspec = g_param_spec_int ("bitrate-tolerance", "Bitrate Tolerance",
"Number of bits the bitstream is allowed to diverge from the reference", "Number of bits the bitstream is allowed to diverge from the reference",
0, 100000000, 8000000, G_PARAM_READWRITE); 0, 100000000, 8000000, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.bit_rate_tolerance, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.bit_rate_tolerance, FALSE, mpeg, NULL);
pspec = g_param_spec_enum ("mb-decision", "Macroblock Decision", pspec = g_param_spec_enum ("mb-decision", "Macroblock Decision",
"Macroblok Decision Mode", "Macroblok Decision Mode",
GST_TYPE_FFMPEG_MB_DECISION, FF_CMP_SAD, G_PARAM_READWRITE); GST_TYPE_FFMPEG_MB_DECISION, FF_CMP_SAD,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.mb_decision, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.mb_decision, FALSE, mpeg, NULL);
pspec = g_param_spec_enum ("mb-cmp", "Macroblock Compare Function", pspec = g_param_spec_enum ("mb-cmp", "Macroblock Compare Function",
"Macroblok Compare Function", "Macroblok Compare Function",
GST_TYPE_FFMPEG_CMP_FUNCTION, FF_CMP_SAD, G_PARAM_READWRITE); GST_TYPE_FFMPEG_CMP_FUNCTION, FF_CMP_SAD,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.mb_cmp, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.mb_cmp, FALSE, mpeg, NULL);
pspec = pspec =
g_param_spec_enum ("me-pre-cmp", g_param_spec_enum ("me-pre-cmp",
"Motion Estimation Pre Pass Compare Function", "Motion Estimation Pre Pass Compare Function",
"Motion Estimation Pre Pass Compare Function", "Motion Estimation Pre Pass Compare Function",
GST_TYPE_FFMPEG_CMP_FUNCTION, FF_CMP_SAD, G_PARAM_READWRITE); GST_TYPE_FFMPEG_CMP_FUNCTION, FF_CMP_SAD,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.me_pre_cmp, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.me_pre_cmp, FALSE, mpeg, NULL);
pspec = g_param_spec_enum ("me-cmp", "Motion Estimation Compare Function", pspec = g_param_spec_enum ("me-cmp", "Motion Estimation Compare Function",
"Motion Estimation Compare Function", "Motion Estimation Compare Function",
GST_TYPE_FFMPEG_CMP_FUNCTION, FF_CMP_SAD, G_PARAM_READWRITE); GST_TYPE_FFMPEG_CMP_FUNCTION, FF_CMP_SAD,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.me_cmp, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.me_cmp, FALSE, mpeg, NULL);
pspec = g_param_spec_enum ("me-sub-cmp", pspec = g_param_spec_enum ("me-sub-cmp",
"Subpixel Motion Estimation Compare Function", "Subpixel Motion Estimation Compare Function",
"Subpixel Motion Estimation Compare Function", "Subpixel Motion Estimation Compare Function",
GST_TYPE_FFMPEG_CMP_FUNCTION, FF_CMP_SAD, G_PARAM_READWRITE); GST_TYPE_FFMPEG_CMP_FUNCTION, FF_CMP_SAD,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.me_sub_cmp, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.me_sub_cmp, FALSE, mpeg, NULL);
pspec = g_param_spec_enum ("ildct-cmp", "Interlaced DCT Compare Function", pspec = g_param_spec_enum ("ildct-cmp", "Interlaced DCT Compare Function",
"Interlaced DCT Compare Function", "Interlaced DCT Compare Function",
GST_TYPE_FFMPEG_CMP_FUNCTION, FF_CMP_VSAD, G_PARAM_READWRITE); GST_TYPE_FFMPEG_CMP_FUNCTION, FF_CMP_VSAD,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.ildct_cmp, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.ildct_cmp, FALSE, mpeg, NULL);
pspec = g_param_spec_enum ("dct-algo", "DCT Algorithm", pspec = g_param_spec_enum ("dct-algo", "DCT Algorithm",
"DCT Algorithm", "DCT Algorithm",
GST_TYPE_FFMPEG_DCT_ALGO, FF_DCT_AUTO, G_PARAM_READWRITE); GST_TYPE_FFMPEG_DCT_ALGO, FF_DCT_AUTO,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.dct_algo, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.dct_algo, FALSE, mpeg, NULL);
pspec = g_param_spec_enum ("idct-algo", "IDCT Algorithm", pspec = g_param_spec_enum ("idct-algo", "IDCT Algorithm",
"IDCT Algorithm", "IDCT Algorithm",
GST_TYPE_FFMPEG_IDCT_ALGO, FF_IDCT_AUTO, G_PARAM_READWRITE); GST_TYPE_FFMPEG_IDCT_ALGO, FF_IDCT_AUTO,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.idct_algo, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.idct_algo, FALSE, mpeg, NULL);
pspec = g_param_spec_enum ("quant-type", "Quantizer Type", pspec = g_param_spec_enum ("quant-type", "Quantizer Type",
"Quantizer Type", GST_TYPE_FFMPEG_QUANT_TYPE, 0, G_PARAM_READWRITE); "Quantizer Type", GST_TYPE_FFMPEG_QUANT_TYPE, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.mpeg_quant, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.mpeg_quant, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("qmin", "Minimum Quantizer", pspec = g_param_spec_int ("qmin", "Minimum Quantizer",
"Minimum Quantizer", 1, 31, 2, G_PARAM_READWRITE); "Minimum Quantizer", 1, 31, 2,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.qmin, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.qmin, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("qmax", "Maximum Quantizer", pspec = g_param_spec_int ("qmax", "Maximum Quantizer",
"Maximum Quantizer", 1, 31, 31, G_PARAM_READWRITE); "Maximum Quantizer", 1, 31, 31,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.qmax, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.qmax, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("max-qdiff", "Maximum Quantizer Difference", pspec = g_param_spec_int ("max-qdiff", "Maximum Quantizer Difference",
"Maximum Quantizer Difference between frames", "Maximum Quantizer Difference between frames",
1, 31, 3, G_PARAM_READWRITE); 1, 31, 3, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.max_qdiff, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.max_qdiff, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("mb_qmin", "Minimum MB Quantizer", pspec = g_param_spec_int ("mb-qmin", "Minimum MB Quantizer",
"Minimum MB Quantizer", 0, 31, 2, G_PARAM_READWRITE); "Minimum MB Quantizer", 0, 31, 2,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.mb_qmin, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.mb_qmin, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("mb_qmax", "Maximum MB Quantizer", pspec = g_param_spec_int ("mb-qmax", "Maximum MB Quantizer",
"Maximum MB Quantizer", 0, 31, 31, G_PARAM_READWRITE); "Maximum MB Quantizer", 0, 31, 31,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.mb_qmax, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.mb_qmax, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("lmin", "Minimum Lagrange Multiplier", pspec = g_param_spec_int ("lmin", "Minimum Lagrange Multiplier",
"Minimum Lagrange Multiplier", 1, 31, 2, G_PARAM_READWRITE); "Minimum Lagrange Multiplier", 1, 31, 2,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, lmin, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, lmin, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("lmax", "Maximum Lagrange Multiplier", pspec = g_param_spec_int ("lmax", "Maximum Lagrange Multiplier",
"Maximum Lagrange Multiplier", 1, 31, 31, G_PARAM_READWRITE); "Maximum Lagrange Multiplier", 1, 31, 31,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, lmax, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, lmax, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("qcompress", "Quantizer Change", pspec = g_param_spec_float ("qcompress", "Quantizer Change",
"Quantizer Change between easy and hard scenes", "Quantizer Change between easy and hard scenes",
0, 1.0f, 0.5f, G_PARAM_READWRITE); 0, 1.0f, 0.5f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.qcompress, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.qcompress, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("qblur", "Quantizer Smoothing", pspec = g_param_spec_float ("qblur", "Quantizer Smoothing",
"Quantizer Smoothing over time", 0, 1.0f, 0.5f, G_PARAM_READWRITE); "Quantizer Smoothing over time", 0, 1.0f, 0.5f,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.qblur, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.qblur, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("rc-qsquish", "Ratecontrol Limiting Method", pspec = g_param_spec_float ("rc-qsquish", "Ratecontrol Limiting Method",
"0 means limit by clipping, otherwise use nice continuous function", "0 means limit by clipping, otherwise use nice continuous function",
0, 99.0f, 1.0f, G_PARAM_READWRITE); 0, 99.0f, 1.0f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.rc_qsquish, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.rc_qsquish, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("rc-qmod-amp", "Ratecontrol Mod", pspec = g_param_spec_float ("rc-qmod-amp", "Ratecontrol Mod",
"Ratecontrol Mod", 0, 99.0f, 0, G_PARAM_READWRITE); "Ratecontrol Mod", 0, 99.0f, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.rc_qmod_amp, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.rc_qmod_amp, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("rc-qmod-freq", "Ratecontrol Freq", pspec = g_param_spec_int ("rc-qmod-freq", "Ratecontrol Freq",
"Ratecontrol Freq", 0, 0, 0, G_PARAM_READWRITE); "Ratecontrol Freq", 0, 0, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.rc_qmod_freq, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.rc_qmod_freq, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("rc-buffer-size", "Ratecontrol Buffer Size", pspec = g_param_spec_int ("rc-buffer-size", "Ratecontrol Buffer Size",
"Decoder bitstream buffer size", 0, G_MAXINT, 0, G_PARAM_READWRITE); "Decoder bitstream buffer size", 0, G_MAXINT, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.rc_buffer_size, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.rc_buffer_size, FALSE, mpeg, NULL);
pspec = pspec =
g_param_spec_float ("rc-buffer-aggressivity", g_param_spec_float ("rc-buffer-aggressivity",
"Ratecontrol Buffer Aggressivity", "Ratecontrol Buffer Aggressivity", 0, "Ratecontrol Buffer Aggressivity", "Ratecontrol Buffer Aggressivity", 0,
99.0f, 1.0f, G_PARAM_READWRITE); 99.0f, 1.0f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.rc_buffer_aggressivity, FALSE, mpeg, gst_ffmpeg_add_pspec (pspec, config.rc_buffer_aggressivity, FALSE, mpeg,
NULL); NULL);
pspec = g_param_spec_int ("rc-max-rate", "Ratecontrol Maximum Bitrate", pspec = g_param_spec_int ("rc-max-rate", "Ratecontrol Maximum Bitrate",
"Ratecontrol Maximum Bitrate", 0, G_MAXINT, 0, G_PARAM_READWRITE); "Ratecontrol Maximum Bitrate", 0, G_MAXINT, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.rc_max_rate, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.rc_max_rate, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("rc-min-rate", "Ratecontrol Minimum Bitrate", pspec = g_param_spec_int ("rc-min-rate", "Ratecontrol Minimum Bitrate",
"Ratecontrol Minimum Bitrate", 0, G_MAXINT, 0, G_PARAM_READWRITE); "Ratecontrol Minimum Bitrate", 0, G_MAXINT, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.rc_min_rate, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.rc_min_rate, FALSE, mpeg, NULL);
pspec = pspec =
g_param_spec_float ("rc-initial-cplx", g_param_spec_float ("rc-initial-cplx",
"Initial Complexity for Pass 1 Ratecontrol", "Initial Complexity for Pass 1 Ratecontrol",
"Initial Complexity for Pass 1 Ratecontrol", 0, 9999999.0f, 0, "Initial Complexity for Pass 1 Ratecontrol", 0, 9999999.0f, 0,
G_PARAM_READWRITE); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.rc_initial_cplx, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.rc_initial_cplx, FALSE, mpeg, NULL);
pspec = g_param_spec_string ("rc-eq", "Ratecontrol Equation", pspec = g_param_spec_string ("rc-eq", "Ratecontrol Equation",
"Ratecontrol Equation", "tex^qComp", G_PARAM_READWRITE); "Ratecontrol Equation", "tex^qComp",
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.rc_eq, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.rc_eq, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("b-quant-factor", "B-Quantizer Factor", pspec = g_param_spec_float ("b-quant-factor", "B-Quantizer Factor",
"Factor in B-Frame Quantizer Computation", "Factor in B-Frame Quantizer Computation",
-31.0f, 31.0f, 1.25f, G_PARAM_READWRITE); -31.0f, 31.0f, 1.25f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.b_quant_factor, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.b_quant_factor, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("b-quant-offset", "B-Quantizer Offset", pspec = g_param_spec_float ("b-quant-offset", "B-Quantizer Offset",
"Offset in B-Frame Quantizer Computation", "Offset in B-Frame Quantizer Computation",
0.0f, 31.0f, 1.25f, G_PARAM_READWRITE); 0.0f, 31.0f, 1.25f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.b_quant_offset, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.b_quant_offset, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("i-quant-factor", "I-Quantizer Factor", pspec = g_param_spec_float ("i-quant-factor", "I-Quantizer Factor",
"Factor in P-Frame Quantizer Computation", "Factor in P-Frame Quantizer Computation",
-31.0f, 31.0f, 0.8f, G_PARAM_READWRITE); -31.0f, 31.0f, 0.8f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.i_quant_factor, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.i_quant_factor, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("i-quant-offset", "I-Quantizer Offset", pspec = g_param_spec_float ("i-quant-offset", "I-Quantizer Offset",
"Offset in P-Frame Quantizer Computation", "Offset in P-Frame Quantizer Computation",
0.0f, 31.0f, 0, G_PARAM_READWRITE); 0.0f, 31.0f, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.i_quant_offset, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.i_quant_offset, FALSE, mpeg, NULL);
/* note overlap with gop-size; 0 means do not override */ /* note overlap with gop-size; 0 means do not override */
pspec = g_param_spec_int ("max-key-interval", "Maximum Key Interval", pspec = g_param_spec_int ("max-key-interval", "Maximum Key Interval",
"Maximum number of frames between two keyframes (< 0 is in sec)", "Maximum number of frames between two keyframes (< 0 is in sec)",
-100, G_MAXINT, 0, G_PARAM_READWRITE); -100, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, max_key_interval, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, max_key_interval, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("luma-elim-threshold", pspec = g_param_spec_int ("luma-elim-threshold",
"Luma Elimination Threshold", "Luma Elimination Threshold",
"Luma Single Coefficient Elimination Threshold", "Luma Single Coefficient Elimination Threshold",
-99, 99, 0, G_PARAM_READWRITE); -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.luma_elim_threshold, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.luma_elim_threshold, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("chroma-elim-threshold", pspec = g_param_spec_int ("chroma-elim-threshold",
"Chroma Elimination Threshold", "Chroma Elimination Threshold",
"Chroma Single Coefficient Elimination Threshold", "Chroma Single Coefficient Elimination Threshold",
-99, 99, 0, G_PARAM_READWRITE); -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.chroma_elim_threshold, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.chroma_elim_threshold, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("lumi-masking", "Luminance Masking", pspec = g_param_spec_float ("lumi-masking", "Luminance Masking",
"Luminance Masking", -1.0f, 1.0f, 0.0f, G_PARAM_READWRITE); "Luminance Masking", -1.0f, 1.0f, 0.0f,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.lumi_masking, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.lumi_masking, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("dark-masking", "Darkness Masking", pspec = g_param_spec_float ("dark-masking", "Darkness Masking",
"Darkness Masking", -1.0f, 1.0f, 0.0f, G_PARAM_READWRITE); "Darkness Masking", -1.0f, 1.0f, 0.0f,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.dark_masking, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.dark_masking, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("temporal-cplx-masking", pspec = g_param_spec_float ("temporal-cplx-masking",
"Temporal Complexity Masking", "Temporal Complexity Masking",
"Temporal Complexity Masking", -1.0f, 1.0f, 0.0f, G_PARAM_READWRITE); "Temporal Complexity Masking", -1.0f, 1.0f, 0.0f,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.temporal_cplx_masking, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.temporal_cplx_masking, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("spatial-cplx-masking", pspec = g_param_spec_float ("spatial-cplx-masking",
"Spatial Complexity Masking", "Spatial Complexity Masking",
"Spatial Complexity Masking", -1.0f, 1.0f, 0.0f, G_PARAM_READWRITE); "Spatial Complexity Masking", -1.0f, 1.0f, 0.0f,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.spatial_cplx_masking, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.spatial_cplx_masking, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("p-masking", "P Block Masking", pspec = g_param_spec_float ("p-masking", "P Block Masking",
"P Block Masking", -1.0f, 1.0f, 0.0f, G_PARAM_READWRITE); "P Block Masking", -1.0f, 1.0f, 0.0f,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.p_masking, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.p_masking, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("dia-size", pspec = g_param_spec_int ("dia-size",
"Motion Estimation Diamond Size/Shape", "Motion Estimation Diamond Size/Shape",
"Motion Estimation Diamond Size/Shape", "Motion Estimation Diamond Size/Shape",
-2000, 2000, 0, G_PARAM_READWRITE); -2000, 2000, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.dia_size, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.dia_size, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("pre-dia-size", pspec = g_param_spec_int ("pre-dia-size",
"Motion Estimation Pre Pass Diamond Size/Shape", "Motion Estimation Pre Pass Diamond Size/Shape",
"Motion Estimation Diamond Size/Shape", "Motion Estimation Diamond Size/Shape",
-2000, 2000, 0, G_PARAM_READWRITE); -2000, 2000, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.pre_dia_size, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.pre_dia_size, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("last-predictor-count", pspec = g_param_spec_int ("last-predictor-count",
"Last Predictor Count", "Last Predictor Count",
"Amount of previous Motion Vector predictors", "Amount of previous Motion Vector predictors",
0, 2000, 0, G_PARAM_READWRITE); 0, 2000, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.last_predictor_count, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.last_predictor_count, FALSE, mpeg, NULL);
pspec = g_param_spec_enum ("pre-me", pspec = g_param_spec_enum ("pre-me",
"Pre Pass for Motion Estimation", "Pre Pass for Motion Estimation",
"Pre Pass for Motion Estimation", "Pre Pass for Motion Estimation",
GST_TYPE_FFMPEG_PRE_ME, 1, G_PARAM_READWRITE); GST_TYPE_FFMPEG_PRE_ME, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.pre_me, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.pre_me, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("me-subpel-quality", pspec = g_param_spec_int ("me-subpel-quality",
"Motion Estimation Subpixel Quality", "Motion Estimation Subpixel Quality",
"Motion Estimation Subpixel Refinement Quality", "Motion Estimation Subpixel Refinement Quality",
0, 8, 8, G_PARAM_READWRITE); 0, 8, 8, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.me_subpel_quality, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.me_subpel_quality, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("me-range", pspec = g_param_spec_int ("me-range",
"Motion Estimation Range", "Motion Estimation Range",
"Motion Estimation search range in subpel units", "Motion Estimation search range in subpel units",
0, 16000, 0, G_PARAM_READWRITE); 0, 16000, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.me_range, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.me_range, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("intra-quant-bias", pspec = g_param_spec_int ("intra-quant-bias",
"Intra Quantizer Bias", "Intra Quantizer Bias",
"Intra Quantizer Bias", "Intra Quantizer Bias",
-1000000, 1000000, FF_DEFAULT_QUANT_BIAS, G_PARAM_READWRITE); -1000000, 1000000, FF_DEFAULT_QUANT_BIAS,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.intra_quant_bias, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.intra_quant_bias, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("inter-quant-bias", pspec = g_param_spec_int ("inter-quant-bias",
"Inter Quantizer Bias", "Inter Quantizer Bias",
"Inter Quantizer Bias", "Inter Quantizer Bias",
-1000000, 1000000, FF_DEFAULT_QUANT_BIAS, G_PARAM_READWRITE); -1000000, 1000000, FF_DEFAULT_QUANT_BIAS,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.inter_quant_bias, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.inter_quant_bias, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("noise-reduction", pspec = g_param_spec_int ("noise-reduction",
"Noise Reduction", "Noise Reduction",
"Noise Reduction Strength", 0, 1000000, 0, G_PARAM_READWRITE); "Noise Reduction Strength", 0, 1000000, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.noise_reduction, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.noise_reduction, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("intra-dc-precision", pspec = g_param_spec_int ("intra-dc-precision",
"Intra DC precision", "Intra DC precision",
"Precision of the Intra DC coefficient - 8", 0, 16, 0, G_PARAM_READWRITE); "Precision of the Intra DC coefficient - 8", 0, 16, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.intra_dc_precision, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.intra_dc_precision, FALSE, mpeg, NULL);
/* TODO skipped coder_type, context_model, inter_threshold, scenechange_threshold */ /* TODO skipped coder_type, context_model, inter_threshold, scenechange_threshold */
pspec = g_param_spec_flags ("flags", "Flags", pspec = g_param_spec_flags ("flags", "Flags",
"Flags", GST_TYPE_FFMPEG_FLAGS, 0, G_PARAM_READWRITE); "Flags", GST_TYPE_FFMPEG_FLAGS, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.flags, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.flags, FALSE, mpeg, NULL);
pspec = g_param_spec_boolean ("interlaced", "Interlaced Material", pspec = g_param_spec_boolean ("interlaced", "Interlaced Material",
"Interlaced Material", FALSE, G_PARAM_READWRITE); "Interlaced Material", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, interlaced, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, interlaced, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("max-bframes", "Max B-Frames", pspec = g_param_spec_int ("max-bframes", "Max B-Frames",
"Maximum B-frames in a row", 0, FF_MAX_B_FRAMES, 0, G_PARAM_READWRITE); "Maximum B-frames in a row", 0, FF_MAX_B_FRAMES, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.max_b_frames, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.max_b_frames, FALSE, mpeg, NULL);
pspec = g_param_spec_enum ("prediction-method", "Prediction Method", pspec = g_param_spec_enum ("prediction-method", "Prediction Method",
"Prediction Method", "Prediction Method",
GST_TYPE_FFMPEG_PRED_METHOD, FF_PRED_LEFT, G_PARAM_READWRITE); GST_TYPE_FFMPEG_PRED_METHOD, FF_PRED_LEFT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.prediction_method, FALSE, huffyuv, NULL); gst_ffmpeg_add_pspec (pspec, config.prediction_method, FALSE, huffyuv, NULL);
pspec = g_param_spec_int ("trellis", "Trellis Quantization", pspec = g_param_spec_int ("trellis", "Trellis Quantization",
"Trellis RD quantization", 0, 1, 1, G_PARAM_READWRITE); "Trellis RD quantization", 0, 1, 1,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.trellis, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.trellis, FALSE, mpeg, NULL);
} }

67
ext/ffmpeg/gstffmpegdec.c
View file

@ -94,6 +94,7 @@ struct _GstFFMpegDec
gboolean direct_rendering; gboolean direct_rendering;
gboolean do_padding; gboolean do_padding;
gboolean debug_mv; gboolean debug_mv;
gboolean crop;
/* QoS stuff *//* with LOCK */ /* QoS stuff *//* with LOCK */
gdouble proportion; gdouble proportion;
@ -142,6 +143,7 @@ struct _GstFFMpegDecClassParams
#define DEFAULT_DIRECT_RENDERING TRUE #define DEFAULT_DIRECT_RENDERING TRUE
#define DEFAULT_DO_PADDING TRUE #define DEFAULT_DO_PADDING TRUE
#define DEFAULT_DEBUG_MV FALSE #define DEFAULT_DEBUG_MV FALSE
#define DEFAULT_CROP TRUE
enum enum
{ {
@ -151,6 +153,7 @@ enum
PROP_DIRECT_RENDERING, PROP_DIRECT_RENDERING,
PROP_DO_PADDING, PROP_DO_PADDING,
PROP_DEBUG_MV, PROP_DEBUG_MV,
PROP_CROP,
PROP_LAST PROP_LAST
}; };
@ -289,23 +292,30 @@ gst_ffmpegdec_class_init (GstFFMpegDecClass * klass)
g_object_class_install_property (gobject_class, PROP_SKIPFRAME, g_object_class_install_property (gobject_class, PROP_SKIPFRAME,
g_param_spec_enum ("skip-frame", "Skip frames", g_param_spec_enum ("skip-frame", "Skip frames",
"Which types of frames to skip during decoding", "Which types of frames to skip during decoding",
GST_FFMPEGDEC_TYPE_SKIPFRAME, 0, G_PARAM_READWRITE)); GST_FFMPEGDEC_TYPE_SKIPFRAME, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_LOWRES, g_object_class_install_property (gobject_class, PROP_LOWRES,
g_param_spec_enum ("lowres", "Low resolution", g_param_spec_enum ("lowres", "Low resolution",
"At which resolution to decode images", "At which resolution to decode images", GST_FFMPEGDEC_TYPE_LOWRES,
GST_FFMPEGDEC_TYPE_LOWRES, 0, G_PARAM_READWRITE)); 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_DIRECT_RENDERING, g_object_class_install_property (gobject_class, PROP_DIRECT_RENDERING,
g_param_spec_boolean ("direct-rendering", "Direct Rendering", g_param_spec_boolean ("direct-rendering", "Direct Rendering",
"Enable direct rendering", "Enable direct rendering", DEFAULT_DIRECT_RENDERING,
DEFAULT_DIRECT_RENDERING, G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_DO_PADDING, g_object_class_install_property (gobject_class, PROP_DO_PADDING,
g_param_spec_boolean ("do-padding", "Do Padding", g_param_spec_boolean ("do-padding", "Do Padding",
"Add 0 padding before decoding data", "Add 0 padding before decoding data", DEFAULT_DO_PADDING,
DEFAULT_DO_PADDING, G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_DEBUG_MV, g_object_class_install_property (gobject_class, PROP_DEBUG_MV,
g_param_spec_boolean ("debug-mv", "Debug motion vectors", g_param_spec_boolean ("debug-mv", "Debug motion vectors",
"Whether ffmpeg should print motion vectors on top of the image", "Whether ffmpeg should print motion vectors on top of the image",
DEFAULT_DEBUG_MV, G_PARAM_READWRITE)); DEFAULT_DEBUG_MV, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#if 0
g_object_class_install_property (gobject_class, PROP_CROP,
g_param_spec_boolean ("crop", "Crop",
"Crop images to the display region",
DEFAULT_CROP, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#endif
} }
gstelement_class->change_state = gst_ffmpegdec_change_state; gstelement_class->change_state = gst_ffmpegdec_change_state;
@ -348,6 +358,7 @@ gst_ffmpegdec_init (GstFFMpegDec * ffmpegdec)
ffmpegdec->direct_rendering = DEFAULT_DIRECT_RENDERING; ffmpegdec->direct_rendering = DEFAULT_DIRECT_RENDERING;
ffmpegdec->do_padding = DEFAULT_DO_PADDING; ffmpegdec->do_padding = DEFAULT_DO_PADDING;
ffmpegdec->debug_mv = DEFAULT_DEBUG_MV; ffmpegdec->debug_mv = DEFAULT_DEBUG_MV;
ffmpegdec->crop = DEFAULT_CROP;
ffmpegdec->format.video.fps_n = -1; ffmpegdec->format.video.fps_n = -1;
ffmpegdec->format.video.old_fps_n = -1; ffmpegdec->format.video.old_fps_n = -1;
@ -634,13 +645,15 @@ gst_ffmpegdec_setcaps (GstPad * pad, GstCaps * caps)
ffmpegdec->ts_is_dts = FALSE; ffmpegdec->ts_is_dts = FALSE;
ffmpegdec->has_b_frames = FALSE; ffmpegdec->has_b_frames = FALSE;
GST_LOG_OBJECT (ffmpegdec, "size %dx%d", ffmpegdec->context->width, ffmpegdec->context->height); GST_LOG_OBJECT (ffmpegdec, "size %dx%d", ffmpegdec->context->width,
ffmpegdec->context->height);
/* get size and so */ /* get size and so */
gst_ffmpeg_caps_with_codecid (oclass->in_plugin->id, gst_ffmpeg_caps_with_codecid (oclass->in_plugin->id,
oclass->in_plugin->type, caps, ffmpegdec->context); oclass->in_plugin->type, caps, ffmpegdec->context);
GST_LOG_OBJECT (ffmpegdec, "size after %dx%d", ffmpegdec->context->width, ffmpegdec->context->height); GST_LOG_OBJECT (ffmpegdec, "size after %dx%d", ffmpegdec->context->width,
ffmpegdec->context->height);
if (!ffmpegdec->context->time_base.den || !ffmpegdec->context->time_base.num) { if (!ffmpegdec->context->time_base.den || !ffmpegdec->context->time_base.num) {
GST_DEBUG_OBJECT (ffmpegdec, "forcing 25/1 framerate"); GST_DEBUG_OBJECT (ffmpegdec, "forcing 25/1 framerate");
@ -723,10 +736,11 @@ gst_ffmpegdec_setcaps (GstPad * pad, GstCaps * caps)
gst_structure_get_int (structure, "height", gst_structure_get_int (structure, "height",
&ffmpegdec->format.video.clip_height); &ffmpegdec->format.video.clip_height);
/* take into account the lowres property */ /* take into account the lowres property */
ffmpegdec->format.video.clip_width >>= ffmpegdec->lowres; if (ffmpegdec->format.video.clip_width != -1)
ffmpegdec->format.video.clip_height >>= ffmpegdec->lowres; ffmpegdec->format.video.clip_width >>= ffmpegdec->lowres;
if (ffmpegdec->format.video.clip_height != -1)
ffmpegdec->format.video.clip_height >>= ffmpegdec->lowres;
done: done:
GST_OBJECT_UNLOCK (ffmpegdec); GST_OBJECT_UNLOCK (ffmpegdec);
@ -827,16 +841,18 @@ gst_ffmpegdec_get_buffer (AVCodecContext * context, AVFrame * picture)
coded_width = context->coded_width; coded_width = context->coded_width;
coded_height = context->coded_height; coded_height = context->coded_height;
GST_LOG_OBJECT (ffmpegdec, "dimension %dx%d, coded %dx%d", width, height, coded_width, coded_height); GST_LOG_OBJECT (ffmpegdec, "dimension %dx%d, coded %dx%d", width, height,
coded_width, coded_height);
if (!ffmpegdec->current_dr) { if (!ffmpegdec->current_dr) {
GST_LOG_OBJECT (ffmpegdec, "direct rendering disabled, fallback alloc"); GST_LOG_OBJECT (ffmpegdec, "direct rendering disabled, fallback alloc");
res = avcodec_default_get_buffer (context, picture); res = avcodec_default_get_buffer (context, picture);
GST_LOG_OBJECT (ffmpegdec, "linsize %d %d %d", picture->linesize[0], GST_LOG_OBJECT (ffmpegdec, "linsize %d %d %d", picture->linesize[0],
picture->linesize[1], picture->linesize[2]); picture->linesize[1], picture->linesize[2]);
GST_LOG_OBJECT (ffmpegdec, "data %d %d %d", 0, picture->data[1] - picture->data[0], GST_LOG_OBJECT (ffmpegdec, "data %d %d %d", 0,
picture->data[2] - picture->data[0]); picture->data[1] - picture->data[0],
picture->data[2] - picture->data[0]);
return res; return res;
} }
@ -1356,7 +1372,7 @@ get_output_buffer (GstFFMpegDec * ffmpegdec, GstBuffer ** outbuf)
if ((height = ffmpegdec->format.video.clip_height) == -1) if ((height = ffmpegdec->format.video.clip_height) == -1)
height = ffmpegdec->context->height; height = ffmpegdec->context->height;
GST_LOG_OBJECT (ffmpegdec, "clip width %d/ height %d", width, height); GST_LOG_OBJECT (ffmpegdec, "clip width %d/height %d", width, height);
ret = alloc_output_buffer (ffmpegdec, outbuf, width, height); ret = alloc_output_buffer (ffmpegdec, outbuf, width, height);
if (G_UNLIKELY (ret != GST_FLOW_OK)) if (G_UNLIKELY (ret != GST_FLOW_OK))
@ -1370,12 +1386,11 @@ get_output_buffer (GstFFMpegDec * ffmpegdec, GstBuffer ** outbuf)
outpic = (AVPicture *) ffmpegdec->picture; outpic = (AVPicture *) ffmpegdec->picture;
GST_LOG_OBJECT (ffmpegdec, "linsize %d %d %d", outpic->linesize[0], GST_LOG_OBJECT (ffmpegdec, "linsize %d %d %d", outpic->linesize[0],
outpic->linesize[1], outpic->linesize[2]); outpic->linesize[1], outpic->linesize[2]);
GST_LOG_OBJECT (ffmpegdec, "data %d %d %d", 0, outpic->data[1] - outpic->data[0], GST_LOG_OBJECT (ffmpegdec, "data %d %d %d", 0,
outpic->data[2] - outpic->data[0]); outpic->data[1] - outpic->data[0], outpic->data[2] - outpic->data[0]);
av_picture_copy (&pic, outpic, av_picture_copy (&pic, outpic, ffmpegdec->context->pix_fmt, width, height);
ffmpegdec->context->pix_fmt, width, height);
} }
ffmpegdec->picture->pts = -1; ffmpegdec->picture->pts = -1;
@ -2425,6 +2440,9 @@ gst_ffmpegdec_set_property (GObject * object,
ffmpegdec->debug_mv = ffmpegdec->context->debug_mv = ffmpegdec->debug_mv = ffmpegdec->context->debug_mv =
g_value_get_boolean (value); g_value_get_boolean (value);
break; break;
case PROP_CROP:
ffmpegdec->crop = g_value_get_boolean (value);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -2453,6 +2471,9 @@ gst_ffmpegdec_get_property (GObject * object,
case PROP_DEBUG_MV: case PROP_DEBUG_MV:
g_value_set_boolean (value, ffmpegdec->context->debug_mv); g_value_set_boolean (value, ffmpegdec->context->debug_mv);
break; break;
case PROP_CROP:
g_value_set_boolean (value, ffmpegdec->crop);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;