summaryrefslogtreecommitdiffstats
path: root/ext/mpeg2enc
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-03-15 19:32:27 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-03-15 19:32:27 +0000
commit4fd57bbe3fef59592a8664dcc9fa2ab32ae99c69 (patch)
tree8f41b30e571aa6ed88b53f5471d5e38461136e60 /ext/mpeg2enc
parent9f4226fe55f09cf5809376b467aa3f46dbf7b5c2 (diff)
downloadgst-plugins-bad-4fd57bbe3fef59592a8664dcc9fa2ab32ae99c69.tar.gz
gst-plugins-bad-4fd57bbe3fef59592a8664dcc9fa2ab32ae99c69.tar.bz2
gst-plugins-bad-4fd57bbe3fef59592a8664dcc9fa2ab32ae99c69.zip
don't mix tabs and spaces
Original commit message from CVS: don't mix tabs and spaces
Diffstat (limited to 'ext/mpeg2enc')
-rw-r--r--ext/mpeg2enc/gstmpeg2enc.cc33
-rw-r--r--ext/mpeg2enc/gstmpeg2encoptions.cc220
-rw-r--r--ext/mpeg2enc/gstmpeg2encpicturereader.cc21
3 files changed, 141 insertions, 133 deletions
diff --git a/ext/mpeg2enc/gstmpeg2enc.cc b/ext/mpeg2enc/gstmpeg2enc.cc
index 1f6e582a..ee64d420 100644
--- a/ext/mpeg2enc/gstmpeg2enc.cc
+++ b/ext/mpeg2enc/gstmpeg2enc.cc
@@ -33,7 +33,8 @@ static void
add_fps (GstCaps * caps)
{
GstStructure *structure = gst_caps_get_structure (caps, 0);
- GValue list = { 0 }, fps = {
+ GValue list = { 0 }, fps =
+ {
0};
gdouble fpss[] = { 24.0 / 1.001, 24.0, 25.0,
30.0 / 1.001, 30.0, 50.0,
@@ -61,10 +62,10 @@ sink_templ (void)
GstCaps *caps;
caps = gst_caps_new_simple ("video/x-raw-yuv",
- "format", GST_TYPE_FOURCC,
- GST_MAKE_FOURCC ('I', '4', '2', '0'),
- "width", GST_TYPE_INT_RANGE, 16, 4096,
- "height", GST_TYPE_INT_RANGE, 16, 4096, NULL);
+ "format", GST_TYPE_FOURCC,
+ GST_MAKE_FOURCC ('I', '4', '2', '0'),
+ "width", GST_TYPE_INT_RANGE, 16, 4096,
+ "height", GST_TYPE_INT_RANGE, 16, 4096, NULL);
add_fps (caps);
templ = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, caps);
@@ -82,10 +83,10 @@ src_templ (void)
GstCaps *caps;
caps = gst_caps_new_simple ("video/mpeg",
- "systemstream", G_TYPE_BOOLEAN, FALSE,
- "mpegversion", GST_TYPE_INT_RANGE, 1, 2,
- "width", GST_TYPE_INT_RANGE, 16, 4096,
- "height", GST_TYPE_INT_RANGE, 16, 4096, NULL);
+ "systemstream", G_TYPE_BOOLEAN, FALSE,
+ "mpegversion", GST_TYPE_INT_RANGE, 1, 2,
+ "width", GST_TYPE_INT_RANGE, 16, 4096,
+ "height", GST_TYPE_INT_RANGE, 16, 4096, NULL);
add_fps (caps);
templ = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, caps);
@@ -132,8 +133,8 @@ gst_mpeg2enc_get_type (void)
};
gst_mpeg2enc_type =
- g_type_register_static (GST_TYPE_ELEMENT,
- "GstMpeg2enc", &gst_mpeg2enc_info, (GTypeFlags) 0);
+ g_type_register_static (GST_TYPE_ELEMENT,
+ "GstMpeg2enc", &gst_mpeg2enc_info, (GTypeFlags) 0);
}
return gst_mpeg2enc_type;
@@ -147,7 +148,7 @@ gst_mpeg2enc_base_init (GstMpeg2encClass * klass)
"Codec/Video/Encoder",
"High-quality MPEG-1/2 video encoder",
"Andrew Stevens <andrew.stevens@nexgo.de>\n"
- "Ronald Bultje <rbultje@ronald.bitfreak.net>"
+ "Ronald Bultje <rbultje@ronald.bitfreak.net>"
};
GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
@@ -199,13 +200,13 @@ gst_mpeg2enc_init (GstMpeg2enc * enc)
enc->sinkpad =
gst_pad_new_from_template (gst_element_class_get_pad_template (klass,
- "sink"), "sink");
+ "sink"), "sink");
gst_pad_set_link_function (enc->sinkpad, gst_mpeg2enc_sink_link);
gst_element_add_pad (element, enc->sinkpad);
enc->srcpad =
gst_pad_new_from_template (gst_element_class_get_pad_template (klass,
- "src"), "src");
+ "src"), "src");
gst_pad_use_explicit_caps (enc->srcpad);
gst_element_add_pad (element, enc->srcpad);
@@ -232,13 +233,13 @@ gst_mpeg2enc_loop (GstElement * element)
if (!(caps = GST_PAD_CAPS (enc->sinkpad))) {
GST_ELEMENT_ERROR (element, CORE, NEGOTIATION, (NULL),
- ("format wasn't negotiated before loop function"));
+ ("format wasn't negotiated before loop function"));
return;
}
/* create new encoder with these settings */
enc->encoder = new GstMpeg2Encoder (enc->options, enc->sinkpad,
- caps, enc->srcpad);
+ caps, enc->srcpad);
/* and set caps on other side */
othercaps = enc->encoder->getFormat ();
diff --git a/ext/mpeg2enc/gstmpeg2encoptions.cc b/ext/mpeg2enc/gstmpeg2encoptions.cc
index 8b6e7765..0d48ed29 100644
--- a/ext/mpeg2enc/gstmpeg2encoptions.cc
+++ b/ext/mpeg2enc/gstmpeg2encoptions.cc
@@ -96,7 +96,7 @@ gst_mpeg2enc_format_get_type (void)
};
mpeg2enc_format_type =
- g_enum_register_static ("GstMpeg2encFormat", mpeg2enc_formats);
+ g_enum_register_static ("GstMpeg2encFormat", mpeg2enc_formats);
}
return mpeg2enc_format_type;
@@ -125,7 +125,7 @@ gst_mpeg2enc_framerate_get_type (void)
};
mpeg2enc_framerate_type =
- g_enum_register_static ("GstMpeg2encFramerate", mpeg2enc_framerates);
+ g_enum_register_static ("GstMpeg2encFramerate", mpeg2enc_framerates);
}
return mpeg2enc_framerate_type;
@@ -150,7 +150,7 @@ gst_mpeg2enc_aspect_get_type (void)
};
mpeg2enc_aspect_type =
- g_enum_register_static ("GstMpeg2encAspect", mpeg2enc_aspects);
+ g_enum_register_static ("GstMpeg2encAspect", mpeg2enc_aspects);
}
return mpeg2enc_aspect_type;
@@ -174,8 +174,8 @@ gst_mpeg2enc_interlace_mode_get_type (void)
};
mpeg2enc_interlace_mode_type =
- g_enum_register_static ("GstMpeg2encInterlaceMode",
- mpeg2enc_interlace_modes);
+ g_enum_register_static ("GstMpeg2encInterlaceMode",
+ mpeg2enc_interlace_modes);
}
return mpeg2enc_interlace_mode_type;
@@ -197,19 +197,19 @@ gst_mpeg2enc_quantisation_matrix_get_type (void)
if (!mpeg2enc_quantisation_matrix_type) {
static const GEnumValue mpeg2enc_quantisation_matrixes[] = {
{GST_MPEG2ENC_QUANTISATION_MATRIX_DEFAULT,
- "0", "Default"},
+ "0", "Default"},
{GST_MPEG2ENC_QUANTISATION_MATRIX_HI_RES,
- "1", "High resolution"},
+ "1", "High resolution"},
{GST_MPEG2ENC_QUANTISATION_MATRIX_KVCD,
- "2", "KVCD"},
+ "2", "KVCD"},
{GST_MPEG2ENC_QUANTISATION_MATRIX_TMPGENC,
- "3", "TMPGEnc"},
+ "3", "TMPGEnc"},
{0, NULL, NULL},
};
mpeg2enc_quantisation_matrix_type =
- g_enum_register_static ("GstMpeg2encQuantisationMatrix",
- mpeg2enc_quantisation_matrixes);
+ g_enum_register_static ("GstMpeg2encQuantisationMatrix",
+ mpeg2enc_quantisation_matrixes);
}
return mpeg2enc_quantisation_matrix_type;
@@ -233,7 +233,7 @@ gst_mpeg2enc_video_norm_get_type (void)
};
mpeg2enc_video_norm_type =
- g_enum_register_static ("GstMpeg2encVideoNorm", mpeg2enc_video_norms);
+ g_enum_register_static ("GstMpeg2encVideoNorm", mpeg2enc_video_norms);
}
return mpeg2enc_video_norm_type;
@@ -256,8 +256,8 @@ gst_mpeg2enc_playback_field_order_get_type (void)
};
mpeg2enc_playback_field_order_type =
- g_enum_register_static ("GstMpeg2encPlaybackFieldOrders",
- mpeg2enc_playback_field_orders);
+ g_enum_register_static ("GstMpeg2encPlaybackFieldOrders",
+ mpeg2enc_playback_field_orders);
}
return mpeg2enc_playback_field_order_type;
@@ -288,160 +288,160 @@ GstMpeg2EncOptions::initProperties (GObjectClass * klass)
/* encoding profile */
g_object_class_install_property (klass, ARG_FORMAT,
g_param_spec_enum ("format", "Format", "Encoding profile format",
- GST_TYPE_MPEG2ENC_FORMAT, 0, (GParamFlags) G_PARAM_READWRITE));
+ GST_TYPE_MPEG2ENC_FORMAT, 0, (GParamFlags) G_PARAM_READWRITE));
/* input/output stream overrides */
g_object_class_install_property (klass, ARG_FRAMERATE,
g_param_spec_enum ("framerate", "Framerate", "Output framerate",
- GST_TYPE_MPEG2ENC_FRAMERATE, 0, (GParamFlags) G_PARAM_READWRITE));
+ GST_TYPE_MPEG2ENC_FRAMERATE, 0, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_ASPECT,
g_param_spec_enum ("aspect", "Aspect", "Display aspect ratio",
- GST_TYPE_MPEG2ENC_ASPECT, 0, (GParamFlags) G_PARAM_READWRITE));
+ GST_TYPE_MPEG2ENC_ASPECT, 0, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_INTERLACE_MODE,
g_param_spec_enum ("interlace-mode", "Interlace mode",
- "MPEG-2 motion estimation and encoding modes",
- GST_TYPE_MPEG2ENC_INTERLACE_MODE, 0,
- (GParamFlags) G_PARAM_READWRITE));
+ "MPEG-2 motion estimation and encoding modes",
+ GST_TYPE_MPEG2ENC_INTERLACE_MODE, 0,
+ (GParamFlags) G_PARAM_READWRITE));
/* general encoding stream options */
g_object_class_install_property (klass, ARG_BITRATE,
g_param_spec_int ("bitrate", "Bitrate", "Compressed video bitrate (kbps)",
- 0, 10 * 1024, 1125, (GParamFlags) G_PARAM_READWRITE));
+ 0, 10 * 1024, 1125, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_NONVIDEO_BITRATE,
g_param_spec_int ("non-video-bitrate", "Non-video bitrate",
- "Assumed bitrate of non-video for sequence splitting (kbps)",
- 0, 10 * 1024, 0, (GParamFlags) G_PARAM_READWRITE));
+ "Assumed bitrate of non-video for sequence splitting (kbps)",
+ 0, 10 * 1024, 0, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_QUANTISATION,
g_param_spec_int ("quantisation", "Quantisation",
- "Quantisation factor (0=default, 1=best, 31=worst)",
- 0, 31, 0, (GParamFlags) G_PARAM_READWRITE));
+ "Quantisation factor (0=default, 1=best, 31=worst)",
+ 0, 31, 0, (GParamFlags) G_PARAM_READWRITE));
/* stills options */
g_object_class_install_property (klass, ARG_VCD_STILL_SIZE,
g_param_spec_int ("vcd-still-size", "VCD stills size",
- "Size of VCD stills (in kB)",
- 0, 512, 0, (GParamFlags) G_PARAM_READWRITE));
+ "Size of VCD stills (in kB)",
+ 0, 512, 0, (GParamFlags) G_PARAM_READWRITE));
/* motion estimation options */
g_object_class_install_property (klass, ARG_MOTION_SEARCH_RADIUS,
g_param_spec_int ("motion-search-radius", "Motion search radius",
- "Motion compensation search radius",
- 0, 32, 16, (GParamFlags) G_PARAM_READWRITE));
+ "Motion compensation search radius",
+ 0, 32, 16, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_REDUCTION_4_4,
g_param_spec_int ("reduction-4x4", "4x4 reduction",
- "Reduction factor for 4x4 subsampled candidate motion estimates"
- " (1=max. quality, 4=max. speed)",
- 1, 4, 2, (GParamFlags) G_PARAM_READWRITE));
+ "Reduction factor for 4x4 subsampled candidate motion estimates"
+ " (1=max. quality, 4=max. speed)",
+ 1, 4, 2, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_REDUCTION_2_2,
g_param_spec_int ("reduction-2x2", "2x2 reduction",
- "Reduction factor for 2x2 subsampled candidate motion estimates"
- " (1=max. quality, 4=max. speed)",
- 1, 4, 3, (GParamFlags) G_PARAM_READWRITE));
+ "Reduction factor for 2x2 subsampled candidate motion estimates"
+ " (1=max. quality, 4=max. speed)",
+ 1, 4, 3, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_UNIT_COEFF_ELIM,
g_param_spec_int ("unit-coeff-elim", "Unit coefficience elimination",
- "How agressively small-unit picture blocks should be skipped",
- -40, 40, 0, (GParamFlags) G_PARAM_READWRITE));
+ "How agressively small-unit picture blocks should be skipped",
+ -40, 40, 0, (GParamFlags) G_PARAM_READWRITE));
/* GOP options */
g_object_class_install_property (klass, ARG_MIN_GOP_SIZE,
g_param_spec_int ("min-gop-size", "Min. GOP size",
- "Minimal size per Group-of-Pictures (-1=default)",
- -1, 250, 0, (GParamFlags) G_PARAM_READWRITE));
+ "Minimal size per Group-of-Pictures (-1=default)",
+ -1, 250, 0, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_MAX_GOP_SIZE,
g_param_spec_int ("max-gop-size", "Max. GOP size",
- "Maximal size per Group-of-Pictures (-1=default)",
- -1, 250, 0, (GParamFlags) G_PARAM_READWRITE));
+ "Maximal size per Group-of-Pictures (-1=default)",
+ -1, 250, 0, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_CLOSED_GOP,
g_param_spec_boolean ("closed-gop", "Closed GOP",
- "All Group-of-Pictures are closed (for multi-angle DVDs)",
- FALSE, (GParamFlags) G_PARAM_READWRITE));
+ "All Group-of-Pictures are closed (for multi-angle DVDs)",
+ FALSE, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_FORCE_B_B_P,
g_param_spec_boolean ("force-b-b-p", "Force B-B-P",
- "Force two B frames between I/P frames when closing GOP boundaries",
- FALSE, (GParamFlags) G_PARAM_READWRITE));
+ "Force two B frames between I/P frames when closing GOP boundaries",
+ FALSE, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_B_PER_REFFRAME,
g_param_spec_int ("b-per-refframe", "B per ref. frame",
- "Number of B frames between each I/P frame",
- 0, 2, 2, (GParamFlags) G_PARAM_READWRITE));
+ "Number of B frames between each I/P frame",
+ 0, 2, 2, (GParamFlags) G_PARAM_READWRITE));
/* quantisation options */
g_object_class_install_property (klass, ARG_QUANTISATION_REDUCTION,
g_param_spec_float ("quantisation-reduction", "Quantisation reduction",
- "Max. quantisation reduction for highly active blocks",
- -4., 10., 0., (GParamFlags) G_PARAM_READWRITE));
+ "Max. quantisation reduction for highly active blocks",
+ -4., 10., 0., (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_QUANT_REDUCTION_MAX_VAR,
g_param_spec_float ("quant-reduction-max-var",
- "Max. quant. reduction variance",
- "Maximal luma variance below which quantisation boost is used", 0.,
- 2500., 0., (GParamFlags) G_PARAM_READWRITE));
+ "Max. quant. reduction variance",
+ "Maximal luma variance below which quantisation boost is used", 0.,
+ 2500., 0., (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_INTRA_DC_PRECISION,
g_param_spec_int ("intra-dc-prec", "Intra. DC precision",
- "Number of bits precision for DC (base colour) in MPEG-2 blocks", 8,
- 11, 9, (GParamFlags) G_PARAM_READWRITE));
+ "Number of bits precision for DC (base colour) in MPEG-2 blocks", 8,
+ 11, 9, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_REDUCE_HF,
g_param_spec_float ("reduce-hf", "Reduce HF",
- "How much to reduce high-frequency resolution (by increasing quantisation)",
- 0., 2., 0., (GParamFlags) G_PARAM_READWRITE));
+ "How much to reduce high-frequency resolution (by increasing quantisation)",
+ 0., 2., 0., (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_KEEP_HF,
g_param_spec_boolean ("keep-hf", "Keep HF",
- "Maximize high-frequency resolution (for high-quality sources)",
- FALSE, (GParamFlags) G_PARAM_READWRITE));
+ "Maximize high-frequency resolution (for high-quality sources)",
+ FALSE, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_QUANTISATION_MATRIX,
g_param_spec_enum ("quant-matrix", "Quant. matrix",
- "Quantisation matrix to use for encoding",
- GST_TYPE_MPEG2ENC_QUANTISATION_MATRIX, 0,
- (GParamFlags) G_PARAM_READWRITE));
+ "Quantisation matrix to use for encoding",
+ GST_TYPE_MPEG2ENC_QUANTISATION_MATRIX, 0,
+ (GParamFlags) G_PARAM_READWRITE));
/* general options */
g_object_class_install_property (klass, ARG_BUFSIZE,
g_param_spec_int ("bufsize", "Decoder buf. size",
- "Target decoders video buffer size (kB)",
- 20, 4000, 46, (GParamFlags) G_PARAM_READWRITE));
+ "Target decoders video buffer size (kB)",
+ 20, 4000, 46, (GParamFlags) G_PARAM_READWRITE));
/* header flag settings */
g_object_class_install_property (klass, ARG_VIDEO_NORM,
g_param_spec_enum ("norm", "Norm",
- "Tag output for specific video norm",
- GST_TYPE_MPEG2ENC_VIDEO_NORM, 0, (GParamFlags) G_PARAM_READWRITE));
+ "Tag output for specific video norm",
+ GST_TYPE_MPEG2ENC_VIDEO_NORM, 0, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_SEQUENCE_LENGTH,
g_param_spec_int ("sequence-length", "Sequence length",
- "Place a sequence boundary after each <num> MB (0=disable)",
- 0, 10 * 1024, 0, (GParamFlags) G_PARAM_READWRITE));
+ "Place a sequence boundary after each <num> MB (0=disable)",
+ 0, 10 * 1024, 0, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_3_2_PULLDOWN,
g_param_spec_boolean ("pulldown-3-2", "3-2 pull down",
- "Generate header flags for 3-2 pull down 24fps movies",
- FALSE, (GParamFlags) G_PARAM_READWRITE));
+ "Generate header flags for 3-2 pull down 24fps movies",
+ FALSE, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_SEQUENCE_HEADER_EVERY_GOP,
g_param_spec_boolean ("sequence-header-every-gop",
- "Sequence hdr. every GOP",
- "Include a sequence header in every GOP",
- FALSE, (GParamFlags) G_PARAM_READWRITE));
+ "Sequence hdr. every GOP",
+ "Include a sequence header in every GOP",
+ FALSE, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_DUMMY_SVCD_SOF,
g_param_spec_boolean ("dummy-svcd-sof", "Dummy SVCD SOF",
- "Generate dummy SVCD scan-data (for vcdimager)",
- TRUE, (GParamFlags) G_PARAM_READWRITE));
+ "Generate dummy SVCD scan-data (for vcdimager)",
+ TRUE, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_PLAYBACK_FIELD_ORDER,
g_param_spec_enum ("playback-field-order", "Playback field order",
- "Force specific playback field order",
- GST_TYPE_MPEG2ENC_PLAYBACK_FIELD_ORDER, Y4M_UNKNOWN,
- (GParamFlags) G_PARAM_READWRITE));
+ "Force specific playback field order",
+ GST_TYPE_MPEG2ENC_PLAYBACK_FIELD_ORDER, Y4M_UNKNOWN,
+ (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_CORRECT_SVCD_HDS,
g_param_spec_boolean ("correct-svcd-hds", "Correct SVCD hor. size",
- "Force SVCD width to 480 instead of 540/720",
- FALSE, (GParamFlags) G_PARAM_READWRITE));
+ "Force SVCD width to 480 instead of 540/720",
+ FALSE, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (klass, ARG_ALTSCAN_MPEG2,
g_param_spec_boolean ("altscan-mpeg2", "Alt. MPEG-2 scan",
- "Alternate MPEG-2 block scanning. Disabling this might "
- "make buggy players play SVCD streams",
- TRUE, (GParamFlags) G_PARAM_READWRITE));
+ "Alternate MPEG-2 block scanning. Disabling this might "
+ "make buggy players play SVCD streams",
+ TRUE, (GParamFlags) G_PARAM_READWRITE));
#if 0
"--dxr2-hack"
#endif
/* dangerous/experimental stuff */
g_object_class_install_property (klass, ARG_CONSTRAINTS,
g_param_spec_boolean ("constraints", "Constraints",
- "Use strict video resolution and bitrate checks",
- TRUE, (GParamFlags) G_PARAM_READWRITE));
+ "Use strict video resolution and bitrate checks",
+ TRUE, (GParamFlags) G_PARAM_READWRITE));
}
/*
@@ -520,18 +520,18 @@ GstMpeg2EncOptions::getProperty (guint prop_id, GValue * value)
break;
case ARG_QUANTISATION_MATRIX:
switch (hf_quant) {
- case 0:
- g_value_set_enum (value, GST_MPEG2ENC_QUANTISATION_MATRIX_DEFAULT);
- break;
- case 2:
- g_value_set_enum (value, GST_MPEG2ENC_QUANTISATION_MATRIX_HI_RES);
- break;
- case 3:
- g_value_set_enum (value, GST_MPEG2ENC_QUANTISATION_MATRIX_KVCD);
- break;
- case 4:
- g_value_set_enum (value, GST_MPEG2ENC_QUANTISATION_MATRIX_TMPGENC);
- break;
+ case 0:
+ g_value_set_enum (value, GST_MPEG2ENC_QUANTISATION_MATRIX_DEFAULT);
+ break;
+ case 2:
+ g_value_set_enum (value, GST_MPEG2ENC_QUANTISATION_MATRIX_HI_RES);
+ break;
+ case 3:
+ g_value_set_enum (value, GST_MPEG2ENC_QUANTISATION_MATRIX_KVCD);
+ break;
+ case 4:
+ g_value_set_enum (value, GST_MPEG2ENC_QUANTISATION_MATRIX_TMPGENC);
+ break;
}
break;
case ARG_BUFSIZE:
@@ -636,26 +636,26 @@ GstMpeg2EncOptions::setProperty (guint prop_id, const GValue * value)
case ARG_REDUCE_HF:
hf_q_boost = g_value_get_float (value);
if (hf_quant == 0 && hf_q_boost != 0.)
- hf_quant = 1;
+ hf_quant = 1;
break;
case ARG_KEEP_HF:
hf_quant = g_value_get_boolean (value) ? 2 : 0;
break;
case ARG_QUANTISATION_MATRIX:
switch (g_value_get_enum (value)) {
- case GST_MPEG2ENC_QUANTISATION_MATRIX_DEFAULT:
- hf_quant = 0;
- hf_q_boost = 0;
- break;
- case GST_MPEG2ENC_QUANTISATION_MATRIX_HI_RES:
- hf_quant = 2;
- break;
- case GST_MPEG2ENC_QUANTISATION_MATRIX_KVCD:
- hf_quant = 3;
- break;
- case GST_MPEG2ENC_QUANTISATION_MATRIX_TMPGENC:
- hf_quant = 4;
- break;
+ case GST_MPEG2ENC_QUANTISATION_MATRIX_DEFAULT:
+ hf_quant = 0;
+ hf_q_boost = 0;
+ break;
+ case GST_MPEG2ENC_QUANTISATION_MATRIX_HI_RES:
+ hf_quant = 2;
+ break;
+ case GST_MPEG2ENC_QUANTISATION_MATRIX_KVCD:
+ hf_quant = 3;
+ break;
+ case GST_MPEG2ENC_QUANTISATION_MATRIX_TMPGENC:
+ hf_quant = 4;
+ break;
}
break;
case ARG_BUFSIZE:
diff --git a/ext/mpeg2enc/gstmpeg2encpicturereader.cc b/ext/mpeg2enc/gstmpeg2encpicturereader.cc
index be8789ee..9ed8afc0 100644
--- a/ext/mpeg2enc/gstmpeg2encpicturereader.cc
+++ b/ext/mpeg2enc/gstmpeg2encpicturereader.cc
@@ -85,7 +85,9 @@ bool GstMpeg2EncPictureReader::LoadFrame ()
GstData *
data;
GstBuffer *
- buf = NULL;
+ buf =
+ NULL;
+
gint
i,
x,
@@ -93,10 +95,15 @@ bool GstMpeg2EncPictureReader::LoadFrame ()
n;
guint8 *
frame;
+
GstFormat
- fmt = GST_FORMAT_DEFAULT;
+ fmt =
+ GST_FORMAT_DEFAULT;
gint64
- pos = 0, tot = 0;
+ pos =
+ 0,
+ tot =
+ 0;
gst_pad_query (GST_PAD_PEER (pad), GST_QUERY_POSITION, &fmt, &pos);
gst_pad_query (GST_PAD_PEER (pad), GST_QUERY_TOTAL, &fmt, &tot);
@@ -106,16 +113,16 @@ bool GstMpeg2EncPictureReader::LoadFrame ()
gst_pad_set_element_private (pad, NULL);
} else if (!(data = gst_pad_pull (pad))) {
GST_ELEMENT_ERROR (gst_pad_get_parent (pad), RESOURCE, READ,
- (NULL), (NULL));
+ (NULL), (NULL));
return true;
}
if (GST_IS_EVENT (data)) {
if (GST_EVENT_TYPE (data) == GST_EVENT_EOS) {
- gst_event_unref (GST_EVENT (data));
- return true;
+ gst_event_unref (GST_EVENT (data));
+ return true;
} else {
- gst_pad_event_default (pad, GST_EVENT (data));
+ gst_pad_event_default (pad, GST_EVENT (data));
}
} else {
buf = GST_BUFFER (data);