summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2007-11-03 16:14:53 +0000
committerEdward Hervey <bilboed@bilboed.com>2007-11-03 16:14:53 +0000
commitf85c737410db5a1c6711f1f3a1b4a767d03013f6 (patch)
treef1d0406636f6470180fee16f6d0515832fb1e40f
parent62c4f57092841598319c4599040c5aa8cde0f53a (diff)
ext/ffmpeg/: gst-indent cleanup.
Original commit message from CVS: * ext/ffmpeg/gstffmpeg.c: (gst_ffmpeg_avcodec_open), (gst_ffmpeg_avcodec_close), (gst_ffmpeg_av_find_stream_info), (gst_ffmpeg_log_callback), (plugin_init): * ext/ffmpeg/gstffmpegcfg.c: (gst_ffmpeg_mb_decision_get_type), (gst_ffmpeg_flags_get_type), (gst_ffmpeg_cfg_init), (gst_ffmpeg_cfg_codec_has_pspec), (gst_ffmpeg_cfg_install_property), (gst_ffmpeg_cfg_set_property), (gst_ffmpeg_cfg_get_property), (gst_ffmpeg_cfg_set_defaults), (gst_ffmpeg_cfg_fill_context), (gst_ffmpeg_cfg_finalize): * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps): * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_open), (gst_ffmpegdec_setcaps), (gst_ffmpegdec_save_incoming_values), (gst_ffmpegdec_get_best_values), (gst_ffmpegdec_video_frame): * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_base_init), (gst_ffmpegdemux_src_query): * ext/ffmpeg/gstffmpegenc.c: (ffmpegenc_setup_working_buf), (gst_ffmpegenc_chain_video), (gst_ffmpegenc_flush_buffers): * ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_open), (gst_ffmpegdata_peek), (gst_ffmpegdata_read), (gst_ffmpegdata_write), (gst_ffmpegdata_seek), (gst_ffmpegdata_close): gst-indent cleanup.
-rw-r--r--ChangeLog25
-rw-r--r--ext/ffmpeg/gstffmpeg.c30
-rw-r--r--ext/ffmpeg/gstffmpegcfg.c239
-rw-r--r--ext/ffmpeg/gstffmpegcodecmap.c8
-rw-r--r--ext/ffmpeg/gstffmpegdec.c42
-rw-r--r--ext/ffmpeg/gstffmpegdemux.c7
-rw-r--r--ext/ffmpeg/gstffmpegenc.c9
-rw-r--r--ext/ffmpeg/gstffmpegprotocol.c120
8 files changed, 248 insertions, 232 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a518c7..eaa95f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2007-11-03 Edward Hervey <bilboed@bilboed.com>
+
+ * ext/ffmpeg/gstffmpeg.c: (gst_ffmpeg_avcodec_open),
+ (gst_ffmpeg_avcodec_close), (gst_ffmpeg_av_find_stream_info),
+ (gst_ffmpeg_log_callback), (plugin_init):
+ * ext/ffmpeg/gstffmpegcfg.c: (gst_ffmpeg_mb_decision_get_type),
+ (gst_ffmpeg_flags_get_type), (gst_ffmpeg_cfg_init),
+ (gst_ffmpeg_cfg_codec_has_pspec),
+ (gst_ffmpeg_cfg_install_property), (gst_ffmpeg_cfg_set_property),
+ (gst_ffmpeg_cfg_get_property), (gst_ffmpeg_cfg_set_defaults),
+ (gst_ffmpeg_cfg_fill_context), (gst_ffmpeg_cfg_finalize):
+ * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps):
+ * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_open),
+ (gst_ffmpegdec_setcaps), (gst_ffmpegdec_save_incoming_values),
+ (gst_ffmpegdec_get_best_values), (gst_ffmpegdec_video_frame):
+ * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_base_init),
+ (gst_ffmpegdemux_src_query):
+ * ext/ffmpeg/gstffmpegenc.c: (ffmpegenc_setup_working_buf),
+ (gst_ffmpegenc_chain_video), (gst_ffmpegenc_flush_buffers):
+ * ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_open),
+ (gst_ffmpegdata_peek), (gst_ffmpegdata_read),
+ (gst_ffmpegdata_write), (gst_ffmpegdata_seek),
+ (gst_ffmpegdata_close):
+ gst-indent cleanup.
+
2007-10-12 Tim-Philipp Müller <tim at centricular dot net>
* configure.ac:
diff --git a/ext/ffmpeg/gstffmpeg.c b/ext/ffmpeg/gstffmpeg.c
index 426c768..a897023 100644
--- a/ext/ffmpeg/gstffmpeg.c
+++ b/ext/ffmpeg/gstffmpeg.c
@@ -44,29 +44,32 @@ static GStaticMutex gst_avcodec_mutex = G_STATIC_MUTEX_INIT;
int
-gst_ffmpeg_avcodec_open (AVCodecContext *avctx, AVCodec *codec) {
+gst_ffmpeg_avcodec_open (AVCodecContext * avctx, AVCodec * codec)
+{
int ret;
g_static_mutex_lock (&gst_avcodec_mutex);
ret = avcodec_open (avctx, codec);
g_static_mutex_unlock (&gst_avcodec_mutex);
-
+
return ret;
}
int
-gst_ffmpeg_avcodec_close (AVCodecContext *avctx) {
+gst_ffmpeg_avcodec_close (AVCodecContext * avctx)
+{
int ret;
-
+
g_static_mutex_lock (&gst_avcodec_mutex);
ret = avcodec_close (avctx);
g_static_mutex_unlock (&gst_avcodec_mutex);
-
+
return ret;
}
int
-gst_ffmpeg_av_find_stream_info(AVFormatContext *ic) {
+gst_ffmpeg_av_find_stream_info (AVFormatContext * ic)
+{
int ret;
g_static_mutex_lock (&gst_avcodec_mutex);
@@ -78,7 +81,7 @@ gst_ffmpeg_av_find_stream_info(AVFormatContext *ic) {
#ifndef GST_DISABLE_GST_DEBUG
static void
-gst_ffmpeg_log_callback (void * ptr, int level, const char * fmt, va_list vl)
+gst_ffmpeg_log_callback (void *ptr, int level, const char *fmt, va_list vl)
{
GstDebugLevel gst_level;
gint len = strlen (fmt);
@@ -106,14 +109,15 @@ gst_ffmpeg_log_callback (void * ptr, int level, const char * fmt, va_list vl)
}
/* remove trailing newline as it gets already appended by the logger */
- if (fmt[len-1] == '\n') {
+ if (fmt[len - 1] == '\n') {
fmt2 = g_strdup (fmt);
- fmt2[len-1] = '\0';
+ fmt2[len - 1] = '\0';
}
- gst_debug_log_valist (ffmpeg_debug, gst_level, "", "", 0, NULL, fmt2?fmt2:fmt, vl);
+ gst_debug_log_valist (ffmpeg_debug, gst_level, "", "", 0, NULL,
+ fmt2 ? fmt2 : fmt, vl);
- g_free(fmt2);
+ g_free (fmt2);
}
#endif
@@ -130,7 +134,7 @@ plugin_init (GstPlugin * plugin)
av_log_set_callback (gst_ffmpeg_log_callback);
#endif
- gst_ffmpeg_init_pix_fmt_info();
+ gst_ffmpeg_init_pix_fmt_info ();
av_register_all ();
@@ -156,5 +160,3 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
"All FFMPEG codecs (" FFMPEG_SOURCE ")",
plugin_init,
PACKAGE_VERSION, "LGPL", "FFMpeg", "http://ffmpeg.sourceforge.net/")
-
-
diff --git a/ext/ffmpeg/gstffmpegcfg.c b/ext/ffmpeg/gstffmpegcfg.c
index b42be81..3cb441e 100644
--- a/ext/ffmpeg/gstffmpegcfg.c
+++ b/ext/ffmpeg/gstffmpegcfg.c
@@ -86,7 +86,8 @@ gst_ffmpeg_mb_decision_get_type (void)
if (!ffmpeg_mb_decision_type) {
static const GEnumValue ffmpeg_mb_decisions[] = {
{FF_MB_DECISION_SIMPLE, "Use method set by mb-cmp", "simple"},
- {FF_MB_DECISION_BITS, "Chooses the one which needs the fewest bits aka vhq mode", "bits"},
+ {FF_MB_DECISION_BITS,
+ "Chooses the one which needs the fewest bits aka vhq mode", "bits"},
{FF_MB_DECISION_RD, "Rate Distortion", "rd"},
{0, NULL, NULL},
};
@@ -263,16 +264,23 @@ gst_ffmpeg_flags_get_type (void)
{CODEC_FLAG_QPEL, "Quartel Pel Motion Compensation", "qpel"},
{CODEC_FLAG_GMC, "GMC", "gmc"},
{CODEC_FLAG_MV0, "Always try a MB with MV (0,0)", "mv0"},
- {CODEC_FLAG_PART, "Store MV, DC and AC coefficients in seperate partitions", "part"},
+ {CODEC_FLAG_PART,
+ "Store MV, DC and AC coefficients in seperate partitions", "part"},
{CODEC_FLAG_GRAY, "Only decode/encode grayscale", "gray"},
- {CODEC_FLAG_NORMALIZE_AQP, "Normalize Adaptive Quantization (masking, etc)", "aqp"},
+ {CODEC_FLAG_NORMALIZE_AQP,
+ "Normalize Adaptive Quantization (masking, etc)", "aqp"},
{CODEC_FLAG_TRELLIS_QUANT, "Trellis Quantization", "trellis"},
- {CODEC_FLAG_GLOBAL_HEADER, "Global headers in extradata instead of every keyframe", "global-headers"},
- {CODEC_FLAG_AC_PRED, "H263 Advanced Intra Coding / MPEG4 AC prediction", "aic"},
+ {CODEC_FLAG_GLOBAL_HEADER,
+ "Global headers in extradata instead of every keyframe",
+ "global-headers"},
+ {CODEC_FLAG_AC_PRED, "H263 Advanced Intra Coding / MPEG4 AC prediction",
+ "aic"},
{CODEC_FLAG_H263P_UMV, "Unlimited Motion Vector", "umv"},
{CODEC_FLAG_CBP_RD, "Rate Distoration Optimization for CBP", "cbp-rd"},
- {CODEC_FLAG_QP_RD, "Rate Distoration Optimization for QP selection", "qp-rd"},
- {CODEC_FLAG_SVCD_SCAN_OFFSET, "Reserve space for SVCD scan offset user data", "scanoffset"},
+ {CODEC_FLAG_QP_RD, "Rate Distoration Optimization for QP selection",
+ "qp-rd"},
+ {CODEC_FLAG_SVCD_SCAN_OFFSET,
+ "Reserve space for SVCD scan offset user data", "scanoffset"},
{CODEC_FLAG_CLOSED_GOP, "Closed GOP", "closedgop"},
{0, NULL, NULL},
};
@@ -375,13 +383,11 @@ gst_ffmpeg_cfg_init ()
/* list properties here */
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);
gst_ffmpeg_add_pspec (pspec, pass, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, quantizer, FALSE, mpeg, NULL);
pspec = g_param_spec_string ("statsfile", "Statistics Filename",
@@ -404,7 +410,9 @@ gst_ffmpeg_cfg_init ()
GST_TYPE_FFMPEG_CMP_FUNCTION, FF_CMP_SAD, G_PARAM_READWRITE);
gst_ffmpeg_add_pspec (pspec, config.mb_cmp, FALSE, mpeg, NULL);
- pspec = g_param_spec_enum ("me-pre-cmp", "Motion Estimation Pre Pass Compare Function",
+ pspec =
+ g_param_spec_enum ("me-pre-cmp",
+ "Motion Estimation Pre Pass Compare Function",
"Motion Estimation Pre Pass Compare Function",
GST_TYPE_FFMPEG_CMP_FUNCTION, FF_CMP_SAD, G_PARAM_READWRITE);
gst_ffmpeg_add_pspec (pspec, config.me_pre_cmp, FALSE, mpeg, NULL);
@@ -436,18 +444,15 @@ gst_ffmpeg_cfg_init ()
gst_ffmpeg_add_pspec (pspec, config.idct_algo, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, config.mpeg_quant, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("qmin", "Minimum Quantizer",
- "Minimum Quantizer",
- 1, 31, 2, G_PARAM_READWRITE);
+ "Minimum Quantizer", 1, 31, 2, G_PARAM_READWRITE);
gst_ffmpeg_add_pspec (pspec, config.qmin, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("qmax", "Maximum Quantizer",
- "Maximum Quantizer",
- 1, 31, 31, G_PARAM_READWRITE);
+ "Maximum Quantizer", 1, 31, 31, G_PARAM_READWRITE);
gst_ffmpeg_add_pspec (pspec, config.qmax, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("max-qdiff", "Maximum Quantizer Difference",
@@ -456,23 +461,19 @@ gst_ffmpeg_cfg_init ()
gst_ffmpeg_add_pspec (pspec, config.max_qdiff, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, config.mb_qmin, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, config.mb_qmax, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, lmin, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, lmax, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("qcompress", "Quantizer Change",
@@ -481,8 +482,7 @@ gst_ffmpeg_cfg_init ()
gst_ffmpeg_add_pspec (pspec, config.qcompress, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, config.qblur, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("rc-qsquish", "Ratecontrol Limiting Method",
@@ -491,43 +491,41 @@ gst_ffmpeg_cfg_init ()
gst_ffmpeg_add_pspec (pspec, config.rc_qsquish, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, config.rc_qmod_amp, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, config.rc_qmod_freq, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, config.rc_buffer_size, FALSE, mpeg, NULL);
- pspec = g_param_spec_float ("rc-buffer-aggressivity", "Ratecontrol Buffer Aggressivity",
- "Ratecontrol Buffer Aggressivity",
- 0, 99.0f, 1.0f, G_PARAM_READWRITE);
- gst_ffmpeg_add_pspec (pspec, config.rc_buffer_aggressivity, FALSE, mpeg, NULL);
+ pspec =
+ g_param_spec_float ("rc-buffer-aggressivity",
+ "Ratecontrol Buffer Aggressivity", "Ratecontrol Buffer Aggressivity", 0,
+ 99.0f, 1.0f, G_PARAM_READWRITE);
+ gst_ffmpeg_add_pspec (pspec, config.rc_buffer_aggressivity, FALSE, mpeg,
+ NULL);
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);
gst_ffmpeg_add_pspec (pspec, config.rc_max_rate, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, config.rc_min_rate, FALSE, mpeg, NULL);
- pspec = g_param_spec_float ("rc-initial-cplx", "Initial Complexity for Pass 1 Ratecontrol",
+ pspec =
+ g_param_spec_float ("rc-initial-cplx",
"Initial Complexity for Pass 1 Ratecontrol",
- 0, 9999999.0f, 0, G_PARAM_READWRITE);
+ "Initial Complexity for Pass 1 Ratecontrol", 0, 9999999.0f, 0,
+ G_PARAM_READWRITE);
gst_ffmpeg_add_pspec (pspec, config.rc_initial_cplx, FALSE, mpeg, NULL);
pspec = g_param_spec_string ("rc-eq", "Ratecontrol Equation",
- "Ratecontrol Equation",
- "tex^qComp", G_PARAM_READWRITE);
+ "Ratecontrol Equation", "tex^qComp", G_PARAM_READWRITE);
gst_ffmpeg_add_pspec (pspec, config.rc_eq, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("b-quant-factor", "B-Quantizer Factor",
@@ -569,30 +567,25 @@ gst_ffmpeg_cfg_init ()
gst_ffmpeg_add_pspec (pspec, config.chroma_elim_threshold, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, config.lumi_masking, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, config.dark_masking, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("temporal-cplx-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);
gst_ffmpeg_add_pspec (pspec, config.temporal_cplx_masking, FALSE, mpeg, NULL);
pspec = g_param_spec_float ("spatial-cplx-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);
gst_ffmpeg_add_pspec (pspec, config.spatial_cplx_masking, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, config.p_masking, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("dia-size",
@@ -610,7 +603,7 @@ gst_ffmpeg_cfg_init ()
pspec = g_param_spec_int ("last-predictor-count",
"Last Predictor Count",
"Amount of previous Motion Vector predictors",
- 0, 2000, 0, G_PARAM_READWRITE);
+ 0, 2000, 0, G_PARAM_READWRITE);
gst_ffmpeg_add_pspec (pspec, config.last_predictor_count, FALSE, mpeg, NULL);
pspec = g_param_spec_enum ("pre-me",
@@ -645,31 +638,26 @@ gst_ffmpeg_cfg_init ()
pspec = g_param_spec_int ("noise-reduction",
"Noise Reduction",
- "Noise Reduction Strength",
- 0, 1000000, 0, G_PARAM_READWRITE);
+ "Noise Reduction Strength", 0, 1000000, 0, G_PARAM_READWRITE);
gst_ffmpeg_add_pspec (pspec, config.noise_reduction, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("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);
gst_ffmpeg_add_pspec (pspec, config.intra_dc_precision, FALSE, mpeg, NULL);
/* TODO skipped coder_type, context_model, inter_threshold, scenechange_threshold */
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);
gst_ffmpeg_add_pspec (pspec, config.flags, FALSE, mpeg, NULL);
pspec = g_param_spec_boolean ("interlaced", "Interlaced Material",
- "Interlaced Material",
- FALSE, G_PARAM_READWRITE);
+ "Interlaced Material", FALSE, G_PARAM_READWRITE);
gst_ffmpeg_add_pspec (pspec, interlaced, FALSE, mpeg, NULL);
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);
gst_ffmpeg_add_pspec (pspec, config.max_b_frames, FALSE, mpeg, NULL);
pspec = g_param_spec_enum ("prediction-method", "Prediction Method",
@@ -683,17 +671,17 @@ gst_ffmpeg_cfg_init ()
/* return TRUE if property described by pspec applies to the codec with codec_id */
static gboolean
-gst_ffmpeg_cfg_codec_has_pspec (enum CodecID codec_id, GParamSpec *pspec)
+gst_ffmpeg_cfg_codec_has_pspec (enum CodecID codec_id, GParamSpec * pspec)
{
GParamSpecData *qdata;
- gint* codec;
+ gint *codec;
gboolean ret = FALSE;
qdata = g_param_spec_get_qdata (pspec, quark);
/* check if excluded first */
if ((codec = qdata->exclude_list)) {
- for ( ; *codec != CODEC_ID_NONE; ++codec) {
+ for (; *codec != CODEC_ID_NONE; ++codec) {
if (*codec == codec_id)
return FALSE;
}
@@ -701,7 +689,7 @@ gst_ffmpeg_cfg_codec_has_pspec (enum CodecID codec_id, GParamSpec *pspec)
/* no include list means it is accepted */
if ((codec = qdata->include_list)) {
- for ( ; *codec != CODEC_ID_NONE; ++codec) {
+ for (; *codec != CODEC_ID_NONE; ++codec) {
if (*codec == codec_id)
ret = TRUE;
}
@@ -724,7 +712,7 @@ gst_ffmpeg_cfg_install_property (GstFFMpegEncClass * klass, guint base)
prop_id = base;
g_return_if_fail (base > 0);
- ctx = avcodec_alloc_context();
+ ctx = avcodec_alloc_context ();
if (ctx)
avcodec_get_context_defaults (ctx);
else
@@ -736,9 +724,9 @@ gst_ffmpeg_cfg_install_property (GstFFMpegEncClass * klass, guint base)
/* 'clone' the paramspec for the various codecs,
* since a single paramspec cannot be owned by distinct types */
- const gchar* name = g_param_spec_get_name (pspec);
- const gchar* nick = g_param_spec_get_nick (pspec);
- const gchar* blurb = g_param_spec_get_blurb (pspec);
+ const gchar *name = g_param_spec_get_name (pspec);
+ const gchar *nick = g_param_spec_get_nick (pspec);
+ const gchar *blurb = g_param_spec_get_blurb (pspec);
GParamSpecData *qdata = g_param_spec_get_qdata (pspec, quark);
gint ctx_offset = 0;
gboolean lavc_default;
@@ -756,71 +744,73 @@ gst_ffmpeg_cfg_install_property (GstFFMpegEncClass * klass, guint base)
}
switch (G_PARAM_SPEC_VALUE_TYPE (pspec)) {
- case G_TYPE_STRING: {
- GParamSpecString* pstring = G_PARAM_SPEC_STRING (pspec);
+ case G_TYPE_STRING:{
+ GParamSpecString *pstring = G_PARAM_SPEC_STRING (pspec);
+
pspec = g_param_spec_string (name, nick, blurb,
- lavc_default ? G_STRUCT_MEMBER (gchar*, ctx, ctx_offset)
- : pstring->default_value,
- pspec->flags);
+ lavc_default ? G_STRUCT_MEMBER (gchar *, ctx, ctx_offset)
+ : pstring->default_value, pspec->flags);
break;
}
- case G_TYPE_INT: {
- GParamSpecInt* pint = G_PARAM_SPEC_INT (pspec);
+ case G_TYPE_INT:{
+ GParamSpecInt *pint = G_PARAM_SPEC_INT (pspec);
+
pspec = g_param_spec_int (name, nick, blurb,
pint->minimum, pint->maximum,
lavc_default ? G_STRUCT_MEMBER (gint, ctx, ctx_offset)
- : pint->default_value,
- pspec->flags);
+ : pint->default_value, pspec->flags);
break;
}
- case G_TYPE_UINT: {
- GParamSpecUInt* puint = G_PARAM_SPEC_UINT (pspec);
+ case G_TYPE_UINT:{
+ GParamSpecUInt *puint = G_PARAM_SPEC_UINT (pspec);
+
pspec = g_param_spec_uint (name, nick, blurb,
- puint->minimum, puint->maximum,
- lavc_default ? G_STRUCT_MEMBER (guint, ctx, ctx_offset)
- : puint->default_value,
- pspec->flags);
+ puint->minimum, puint->maximum,
+ lavc_default ? G_STRUCT_MEMBER (guint, ctx, ctx_offset)
+ : puint->default_value, pspec->flags);
break;
}
- case G_TYPE_ULONG: {
- GParamSpecULong* pulong = G_PARAM_SPEC_ULONG (pspec);
+ case G_TYPE_ULONG:{
+ GParamSpecULong *pulong = G_PARAM_SPEC_ULONG (pspec);
+
pspec = g_param_spec_ulong (name, nick, blurb,
pulong->minimum, pulong->maximum,
lavc_default ? G_STRUCT_MEMBER (gulong, ctx, ctx_offset)
- : pulong->default_value,
- pspec->flags);
+ : pulong->default_value, pspec->flags);
break;
}
- case G_TYPE_FLOAT: {
- GParamSpecFloat* pfloat = G_PARAM_SPEC_FLOAT (pspec);
+ case G_TYPE_FLOAT:{
+ GParamSpecFloat *pfloat = G_PARAM_SPEC_FLOAT (pspec);
+
pspec = g_param_spec_float (name, nick, blurb,
pfloat->minimum, pfloat->maximum,
lavc_default ? G_STRUCT_MEMBER (gfloat, ctx, ctx_offset)
- : pfloat->default_value,
- pspec->flags);
+ : pfloat->default_value, pspec->flags);
break;
}
- case G_TYPE_BOOLEAN: {
- GParamSpecBoolean* pboolean = G_PARAM_SPEC_BOOLEAN (pspec);
+ case G_TYPE_BOOLEAN:{
+ GParamSpecBoolean *pboolean = G_PARAM_SPEC_BOOLEAN (pspec);
+
pspec = g_param_spec_boolean (name, nick, blurb,
lavc_default ? G_STRUCT_MEMBER (gboolean, ctx, ctx_offset)
- : pboolean->default_value,
- pspec->flags);
+ : pboolean->default_value, pspec->flags);
break;
}
default:
if (G_IS_PARAM_SPEC_ENUM (pspec)) {
- GParamSpecEnum* penum = G_PARAM_SPEC_ENUM (pspec);
+ GParamSpecEnum *penum = G_PARAM_SPEC_ENUM (pspec);
+
pspec = g_param_spec_enum (name, nick, blurb,
pspec->value_type,
lavc_default ? G_STRUCT_MEMBER (gint, ctx, ctx_offset)
- : penum->default_value, pspec->flags);
+ : penum->default_value, pspec->flags);
} else if (G_IS_PARAM_SPEC_FLAGS (pspec)) {
- GParamSpecFlags* pflags = G_PARAM_SPEC_FLAGS (pspec);
+ GParamSpecFlags *pflags = G_PARAM_SPEC_FLAGS (pspec);
+
pspec = g_param_spec_flags (name, nick, blurb,
pspec->value_type,
lavc_default ? G_STRUCT_MEMBER (guint, ctx, ctx_offset)
- : pflags->default_value, pspec->flags);
+ : pflags->default_value, pspec->flags);
} else {
g_critical ("%s does not yet support type %s", GST_FUNCTION,
g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)));
@@ -881,22 +871,22 @@ gst_ffmpeg_cfg_set_property (GObject * object,
g_value_get_float (value);
break;
case G_TYPE_STRING:
- g_return_val_if_fail (qdata->size == sizeof (gchar*), TRUE);
- g_free (G_STRUCT_MEMBER (gchar*, ffmpegenc, qdata->offset));
- G_STRUCT_MEMBER (gchar*, ffmpegenc, qdata->offset) =
+ g_return_val_if_fail (qdata->size == sizeof (gchar *), TRUE);
+ g_free (G_STRUCT_MEMBER (gchar *, ffmpegenc, qdata->offset));
+ G_STRUCT_MEMBER (gchar *, ffmpegenc, qdata->offset) =
g_value_dup_string (value);
break;
- default: /* must be enum, given the check above */
+ default: /* must be enum, given the check above */
if (G_IS_PARAM_SPEC_ENUM (pspec)) {
g_return_val_if_fail (qdata->size == sizeof (gint), TRUE);
G_STRUCT_MEMBER (gint, ffmpegenc, qdata->offset) =
- g_value_get_enum (value);
+ g_value_get_enum (value);
} else if (G_IS_PARAM_SPEC_FLAGS (pspec)) {
g_return_val_if_fail (qdata->size == sizeof (guint), TRUE);
G_STRUCT_MEMBER (guint, ffmpegenc, qdata->offset) =
g_value_get_flags (value);
- } else { /* oops, bit lazy we don't cover this case yet */
- g_critical ("%s does not yet support type %s",GST_FUNCTION,
+ } else { /* oops, bit lazy we don't cover this case yet */
+ g_critical ("%s does not yet support type %s", GST_FUNCTION,
g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)));
}
@@ -935,8 +925,7 @@ gst_ffmpeg_cfg_get_property (GObject * object,
break;
case G_TYPE_INT:
g_return_val_if_fail (qdata->size == sizeof (gint), TRUE);
- g_value_set_int (value,
- G_STRUCT_MEMBER (gint, ffmpegenc, qdata->offset));
+ g_value_set_int (value, G_STRUCT_MEMBER (gint, ffmpegenc, qdata->offset));
break;
case G_TYPE_ULONG:
g_return_val_if_fail (qdata->size == sizeof (gulong), TRUE);
@@ -949,11 +938,11 @@ gst_ffmpeg_cfg_get_property (GObject * object,
G_STRUCT_MEMBER (gfloat, ffmpegenc, qdata->offset));
break;
case G_TYPE_STRING:
- g_return_val_if_fail (qdata->size == sizeof (gchar*), TRUE);
+ g_return_val_if_fail (qdata->size == sizeof (gchar *), TRUE);
g_value_take_string (value,
- g_strdup (G_STRUCT_MEMBER (gchar*, ffmpegenc, qdata->offset)));
+ g_strdup (G_STRUCT_MEMBER (gchar *, ffmpegenc, qdata->offset)));
break;
- default: /* must be enum, given the check above */
+ default: /* must be enum, given the check above */
if (G_IS_PARAM_SPEC_ENUM (pspec)) {
g_return_val_if_fail (qdata->size == sizeof (gint), TRUE);
g_value_set_enum (value,
@@ -962,7 +951,7 @@ gst_ffmpeg_cfg_get_property (GObject * object,
g_return_val_if_fail (qdata->size == sizeof (guint), TRUE);
g_value_set_flags (value,
G_STRUCT_MEMBER (guint, ffmpegenc, qdata->offset));
- } else { /* oops, bit lazy we don't cover this case yet */
+ } else { /* oops, bit lazy we don't cover this case yet */
g_critical ("%s does not yet support type %s", GST_FUNCTION,
g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)));
}
@@ -982,8 +971,9 @@ gst_ffmpeg_cfg_set_defaults (GstFFMpegEnc * ffmpegenc)
&num_props);
for (i = 0; i < num_props; ++i) {
- GValue val = {0, };
+ GValue val = { 0, };
GParamSpec *pspec = pspecs[i];
+
/* only touch those that are really ours; i.e. should have some qdata */
if (!g_param_spec_get_qdata (pspec, quark))
continue;
@@ -1020,8 +1010,7 @@ gst_ffmpeg_cfg_fill_context (GstFFMpegEnc * ffmpegenc, AVCodecContext * context)
&& context_offset >= 0) {
/* memcpy a bit heavy for a small copy, but hardly part of 'inner loop' */
memcpy (G_STRUCT_MEMBER_P (context, context_offset),
- G_STRUCT_MEMBER_P (ffmpegenc, qdata->offset),
- qdata->size);
+ G_STRUCT_MEMBER_P (ffmpegenc, qdata->offset), qdata->size);
}
list = list->next;
}
@@ -1048,9 +1037,9 @@ gst_ffmpeg_cfg_finalize (GstFFMpegEnc * ffmpegenc)
switch (G_PARAM_SPEC_VALUE_TYPE (pspec)) {
case G_TYPE_STRING:
- if(qdata->size == sizeof (gchar*)) {
- g_free (G_STRUCT_MEMBER (gchar*, ffmpegenc, qdata->offset));
- G_STRUCT_MEMBER (gchar*, ffmpegenc, qdata->offset) = NULL;
+ if (qdata->size == sizeof (gchar *)) {
+ g_free (G_STRUCT_MEMBER (gchar *, ffmpegenc, qdata->offset));
+ G_STRUCT_MEMBER (gchar *, ffmpegenc, qdata->offset) = NULL;
}
break;
default:
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index cba75cc..d0696e7 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -277,12 +277,12 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
"systemstream", G_TYPE_BOOLEAN, FALSE,
"rmversion", G_TYPE_INT, version, NULL);
if (context) {
- gst_caps_set_simple (caps,
- "format", G_TYPE_INT, context->sub_id, NULL);
+ gst_caps_set_simple (caps, "format", G_TYPE_INT, context->sub_id, NULL);
if (context->extradata_size >= 8) {
gst_caps_set_simple (caps,
- "subformat", G_TYPE_INT, GST_READ_UINT32_BE (context->extradata), NULL);
- }
+ "subformat", G_TYPE_INT, GST_READ_UINT32_BE (context->extradata),
+ NULL);
+ }
}
}
break;
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index efcde44..0b6a948 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -544,7 +544,8 @@ gst_ffmpegdec_open (GstFFMpegDec * ffmpegdec)
}
/* out-of-order incoming buffer handling */
- if ((oclass->in_plugin->id == CODEC_ID_H264) && (ffmpegdec->context->extradata_size != 0))
+ if ((oclass->in_plugin->id == CODEC_ID_H264)
+ && (ffmpegdec->context->extradata_size != 0))
ffmpegdec->outoforder = TRUE;
ffmpegdec->next_ts = GST_CLOCK_TIME_NONE;
@@ -630,7 +631,7 @@ gst_ffmpegdec_setcaps (GstPad * pad, GstCaps * caps)
GST_DEBUG_OBJECT (ffmpegdec, "Using framerate from codec");
}
- if(oclass->in_plugin->id != CODEC_ID_H264) {
+ if (oclass->in_plugin->id != CODEC_ID_H264) {
/* do *not* draw edges */
ffmpegdec->context->flags |= CODEC_FLAG_EMU_EDGE;
}
@@ -852,13 +853,14 @@ no_par:
}
static void
-gst_ffmpegdec_save_incoming_values (GstFFMpegDec * ffmpegdec, GstClockTime timestamp,
- GstClockTime duration)
+gst_ffmpegdec_save_incoming_values (GstFFMpegDec * ffmpegdec,
+ GstClockTime timestamp, GstClockTime duration)
{
- GST_LOG_OBJECT (ffmpegdec, "BEFORE timestamp:%"GST_TIME_FORMAT"/%"GST_TIME_FORMAT
- " duration:%"GST_TIME_FORMAT"/%"GST_TIME_FORMAT,
- GST_TIME_ARGS (ffmpegdec->tstamp1), GST_TIME_ARGS (ffmpegdec->tstamp2),
- GST_TIME_ARGS (ffmpegdec->dur1), GST_TIME_ARGS (ffmpegdec->dur2));
+ GST_LOG_OBJECT (ffmpegdec,
+ "BEFORE timestamp:%" GST_TIME_FORMAT "/%" GST_TIME_FORMAT " duration:%"
+ GST_TIME_FORMAT "/%" GST_TIME_FORMAT, GST_TIME_ARGS (ffmpegdec->tstamp1),
+ GST_TIME_ARGS (ffmpegdec->tstamp2), GST_TIME_ARGS (ffmpegdec->dur1),
+ GST_TIME_ARGS (ffmpegdec->dur2));
/* shift previous new values to oldest */
if (ffmpegdec->tstamp2 != GST_CLOCK_TIME_NONE)
@@ -869,16 +871,17 @@ gst_ffmpegdec_save_incoming_values (GstFFMpegDec * ffmpegdec, GstClockTime times
ffmpegdec->tstamp2 = timestamp;
ffmpegdec->dur2 = duration;
- GST_LOG_OBJECT (ffmpegdec, "AFTER timestamp:%"GST_TIME_FORMAT"/%"GST_TIME_FORMAT
- " duration:%"GST_TIME_FORMAT"/%"GST_TIME_FORMAT,
- GST_TIME_ARGS (ffmpegdec->tstamp1), GST_TIME_ARGS (ffmpegdec->tstamp2),
- GST_TIME_ARGS (ffmpegdec->dur1), GST_TIME_ARGS (ffmpegdec->dur2));
+ GST_LOG_OBJECT (ffmpegdec,
+ "AFTER timestamp:%" GST_TIME_FORMAT "/%" GST_TIME_FORMAT " duration:%"
+ GST_TIME_FORMAT "/%" GST_TIME_FORMAT, GST_TIME_ARGS (ffmpegdec->tstamp1),
+ GST_TIME_ARGS (ffmpegdec->tstamp2), GST_TIME_ARGS (ffmpegdec->dur1),
+ GST_TIME_ARGS (ffmpegdec->dur2));
}
static void
-gst_ffmpegdec_get_best_values (GstFFMpegDec * ffmpegdec, GstClockTime *timestamp,
- GstClockTime *duration)
+gst_ffmpegdec_get_best_values (GstFFMpegDec * ffmpegdec,
+ GstClockTime * timestamp, GstClockTime * duration)
{
/* Best timestamp is the smallest valid timestamp */
if (ffmpegdec->tstamp1 == GST_CLOCK_TIME_NONE) {
@@ -904,9 +907,9 @@ gst_ffmpegdec_get_best_values (GstFFMpegDec * ffmpegdec, GstClockTime *timestamp
ffmpegdec->dur1 = GST_CLOCK_TIME_NONE;
}
- GST_LOG_OBJECT (ffmpegdec, "Returning timestamp:%"GST_TIME_FORMAT" duration:%"GST_TIME_FORMAT,
- GST_TIME_ARGS (*timestamp),
- GST_TIME_ARGS (*duration));
+ GST_LOG_OBJECT (ffmpegdec,
+ "Returning timestamp:%" GST_TIME_FORMAT " duration:%" GST_TIME_FORMAT,
+ GST_TIME_ARGS (*timestamp), GST_TIME_ARGS (*duration));
}
static gboolean
@@ -1429,7 +1432,7 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
/* if we have an input framerate, use that */
if (ffmpegdec->format.video.fps_n != -1 &&
(ffmpegdec->format.video.fps_n != 1000 &&
- ffmpegdec->format.video.fps_d != 1)) {
+ ffmpegdec->format.video.fps_d != 1)) {
GST_LOG_OBJECT (ffmpegdec, "using input framerate for duration");
in_duration = gst_util_uint64_scale_int (GST_SECOND,
ffmpegdec->format.video.fps_d, ffmpegdec->format.video.fps_n);
@@ -1447,8 +1450,7 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
GST_LOG_OBJECT (ffmpegdec, "no valid duration found");
}
}
- }
- else {
+ } else {
GST_LOG_OBJECT (ffmpegdec, "using in_duration");
}
diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index b0a5322..8ea8c6e 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -171,8 +171,7 @@ gst_ffmpegdemux_base_init (GstFFMpegDemuxClass * klass)
GstElementDetails details;
GstPadTemplate *sinktempl, *audiosrctempl, *videosrctempl;
- params =
- (GstFFMpegDemuxClassParams *)
+ params = (GstFFMpegDemuxClassParams *)
g_type_get_qdata (G_OBJECT_CLASS_TYPE (klass), GST_FFDEMUX_PARAMS_QDATA);
g_assert (params != NULL);
@@ -711,8 +710,8 @@ gst_ffmpegdemux_src_query (GstPad * pad, GstQuery * query)
timeduration =
gst_ffmpeg_time_ff_to_gst (avstream->duration, avstream->time_base);
if (!(GST_CLOCK_TIME_IS_VALID (timeduration))) {
- /* use duration of complete file if the stream duration is not known */
- timeduration = demux->duration;
+ /* use duration of complete file if the stream duration is not known */
+ timeduration = demux->duration;
if (!(GST_CLOCK_TIME_IS_VALID (timeduration)))
break;
}
diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c
index 028a2e7..eba1193 100644
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/ffmpeg/gstffmpegenc.c
@@ -570,9 +570,9 @@ gst_ffmpegenc_setcaps (GstPad * pad, GstCaps * caps)
}
static void
-ffmpegenc_setup_working_buf (GstFFMpegEnc *ffmpegenc)
+ffmpegenc_setup_working_buf (GstFFMpegEnc * ffmpegenc)
{
- if (ffmpegenc->working_buf == NULL ||
+ if (ffmpegenc->working_buf == NULL ||
ffmpegenc->working_buf_size != ffmpegenc->buffer_size) {
if (ffmpegenc->working_buf)
g_free (ffmpegenc->working_buf);
@@ -605,8 +605,7 @@ gst_ffmpegenc_chain_video (GstPad * pad, GstBuffer * inbuf)
ffmpegenc_setup_working_buf (ffmpegenc);
ret_size = avcodec_encode_video (ffmpegenc->context,
- ffmpegenc->working_buf, ffmpegenc->working_buf_size,
- ffmpegenc->picture);
+ ffmpegenc->working_buf, ffmpegenc->working_buf_size, ffmpegenc->picture);
if (ret_size < 0) {
#ifndef GST_DISABLE_GST_DEBUG
@@ -758,7 +757,7 @@ gst_ffmpegenc_flush_buffers (GstFFMpegEnc * ffmpegenc, gboolean send)
ffmpegenc_setup_working_buf (ffmpegenc);
ret_size = avcodec_encode_video (ffmpegenc->context,
- ffmpegenc->working_buf, ffmpegenc->working_buf_size, NULL);
+ ffmpegenc->working_buf, ffmpegenc->working_buf_size, NULL);
if (ret_size < 0) { /* there should be something, notify and give up */
#ifndef GST_DISABLE_GST_DEBUG
diff --git a/ext/ffmpeg/gstffmpegprotocol.c b/ext/ffmpeg/gstffmpegprotocol.c
index 7923e6d..7cf45c8 100644
--- a/ext/ffmpeg/gstffmpegprotocol.c
+++ b/ext/ffmpeg/gstffmpegprotocol.c
@@ -57,7 +57,7 @@ gst_ffmpegdata_open (URLContext * h, const char *filename, int flags)
info->set_streamheader = flags & GST_FFMPEG_URL_STREAMHEADER;
flags &= ~GST_FFMPEG_URL_STREAMHEADER;
h->flags &= ~GST_FFMPEG_URL_STREAMHEADER;
-
+
/* we don't support R/W together */
if (flags != URL_RDONLY && flags != URL_WRONLY) {
GST_WARNING ("Only read-only or write-only are supported");
@@ -98,14 +98,14 @@ gst_ffmpegdata_peek (URLContext * h, unsigned char *buf, int size)
GstProtocolInfo *info;
GstBuffer *inbuf = NULL;
GstFlowReturn ret;
- int total = 0;
-
+ int total = 0;
+
g_return_val_if_fail (h->flags == URL_RDONLY, AVERROR_IO);
info = (GstProtocolInfo *) h->priv_data;
GST_DEBUG ("Pulling %d bytes at position %lld", size, info->offset);
- ret = gst_pad_pull_range(info->pad, info->offset, (guint) size, &inbuf);
+ ret = gst_pad_pull_range (info->pad, info->offset, (guint) size, &inbuf);
switch (ret) {
case GST_FLOW_OK:
@@ -125,7 +125,8 @@ gst_ffmpegdata_peek (URLContext * h, unsigned char *buf, int size)
break;
}
- GST_DEBUG ("Got %d (%s) return result %d", ret, gst_flow_get_name (ret), total);
+ GST_DEBUG ("Got %d (%s) return result %d", ret, gst_flow_get_name (ret),
+ total);
return total;
}
@@ -140,7 +141,7 @@ gst_ffmpegdata_read (URLContext * h, unsigned char *buf, int size)
GST_DEBUG ("Reading %d bytes of data at position %lld", size, info->offset);
- res = gst_ffmpegdata_peek(h, buf, size);
+ res = gst_ffmpegdata_peek (h, buf, size);
if (res >= 0)
info->offset += res;
@@ -161,15 +162,13 @@ gst_ffmpegdata_write (URLContext * h, unsigned char *buf, int size)
g_return_val_if_fail (h->flags != URL_RDONLY, -EIO);
/* create buffer and push data further */
- if (gst_pad_alloc_buffer_and_set_caps(info->pad,
- info->offset,
- size, GST_PAD_CAPS (info->pad),
- &outbuf) != GST_FLOW_OK)
+ if (gst_pad_alloc_buffer_and_set_caps (info->pad,
+ info->offset, size, GST_PAD_CAPS (info->pad), &outbuf) != GST_FLOW_OK)
return 0;
-
+
memcpy (GST_BUFFER_DATA (outbuf), buf, size);
- if (gst_pad_push(info->pad, outbuf) != GST_FLOW_OK)
+ if (gst_pad_push (info->pad, outbuf) != GST_FLOW_OK)
return 0;
info->offset += size;
@@ -189,59 +188,60 @@ gst_ffmpegdata_seek (URLContext * h, offset_t pos, int whence)
/* TODO : if we are push-based, we need to return sensible info */
switch (h->flags) {
- case URL_RDONLY:
+ case URL_RDONLY:
{
/* sinkpad */
switch (whence) {
- case SEEK_SET:
- info->offset = (guint64) pos;
- break;
- case SEEK_CUR:
- info->offset += pos;
- break;
- case SEEK_END:
- /* ffmpeg wants to know the current end position in bytes ! */
- {
- GstFormat format = GST_FORMAT_BYTES;
- gint64 duration;
-
- if (gst_pad_is_linked (info->pad))
- if (gst_pad_query_duration (GST_PAD_PEER (info->pad), &format, &duration))
- info->offset = ((guint64) duration) + pos;
- }
- break;
- default:
- break;
+ case SEEK_SET:
+ info->offset = (guint64) pos;
+ break;
+ case SEEK_CUR:
+ info->offset += pos;
+ break;
+ case SEEK_END:
+ /* ffmpeg wants to know the current end position in bytes ! */
+ {
+ GstFormat format = GST_FORMAT_BYTES;
+ gint64 duration;
+
+ if (gst_pad_is_linked (info->pad))
+ if (gst_pad_query_duration (GST_PAD_PEER (info->pad), &format,
+ &duration))
+ info->offset = ((guint64) duration) + pos;
+ }
+ break;
+ default:
+ break;
}
/* FIXME : implement case for push-based behaviour */
newpos = info->offset;
}
- break;
- case URL_WRONLY:
+ break;
+ case URL_WRONLY:
{
/* srcpad */
switch (whence) {
- case SEEK_SET:
- info->offset = (guint64) pos;
- gst_pad_push_event (info->pad,gst_event_new_new_segment
- (TRUE, 1.0, GST_FORMAT_BYTES, info->offset,
- GST_CLOCK_TIME_NONE, info->offset));
- break;
- case SEEK_CUR:
- info->offset += pos;
- gst_pad_push_event (info->pad,gst_event_new_new_segment
- (TRUE, 1.0, GST_FORMAT_BYTES, info->offset,
- GST_CLOCK_TIME_NONE, info->offset));
- break;
- default:
- break;
+ case SEEK_SET:
+ info->offset = (guint64) pos;
+ gst_pad_push_event (info->pad, gst_event_new_new_segment
+ (TRUE, 1.0, GST_FORMAT_BYTES, info->offset,
+ GST_CLOCK_TIME_NONE, info->offset));
+ break;
+ case SEEK_CUR:
+ info->offset += pos;
+ gst_pad_push_event (info->pad, gst_event_new_new_segment
+ (TRUE, 1.0, GST_FORMAT_BYTES, info->offset,
+ GST_CLOCK_TIME_NONE, info->offset));
+ break;
+ default:
+ break;
}
newpos = info->offset;
}
- break;
- default:
- g_assert(0);
- break;
+ break;
+ default:
+ g_assert (0);
+ break;
}
GST_DEBUG ("Now at offset %lld", info->offset);
@@ -263,13 +263,13 @@ gst_ffmpegdata_close (URLContext * h)
case URL_WRONLY:
{
/* send EOS - that closes down the stream */
- gst_pad_push_event (info->pad, gst_event_new_eos());
+ gst_pad_push_event (info->pad, gst_event_new_eos ());
break;
}
default:
break;
}
-
+
/* clean up data */
g_free (info);
h->priv_data = NULL;
@@ -279,10 +279,10 @@ gst_ffmpegdata_close (URLContext * h)
URLProtocol gstreamer_protocol = {
- /*.name = */"gstreamer",
- /*.url_open = */gst_ffmpegdata_open,
- /*.url_read = */gst_ffmpegdata_read,
- /*.url_write = */gst_ffmpegdata_write,
- /*.url_seek = */gst_ffmpegdata_seek,
- /*.url_close = */gst_ffmpegdata_close,
+ /*.name = */ "gstreamer",
+ /*.url_open = */ gst_ffmpegdata_open,
+ /*.url_read = */ gst_ffmpegdata_read,
+ /*.url_write = */ gst_ffmpegdata_write,
+ /*.url_seek = */ gst_ffmpegdata_seek,
+ /*.url_close = */ gst_ffmpegdata_close,
};