summaryrefslogtreecommitdiff
path: root/gst-libs
diff options
context:
space:
mode:
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>2013-01-22 11:42:49 +0100
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>2013-01-22 14:22:30 +0100
commitcbec9bfcd004365d603afcdd13731a833ba42b99 (patch)
tree88ea2198818b04afcd22f6c7f36e44ed5f00a85c /gst-libs
parent4202eeff7d4f424ee756918fbb9fadf3ce78d5b7 (diff)
downloadgstreamer-plugins-bad-cbec9bfcd004365d603afcdd13731a833ba42b99.tar.gz
codecparsers: vc1: simplify GstVC1VopDquant structure.
Rename dqsbedge to dqbedge. The intent is that we can only have a single boundary edge selector, depending on the value of dqprofile. So, dqbedge represents DQSBEDGE if dqprofile == GST_VC1_DQPROFILE_SINGLE_EDGE, or DQDBEDGE if dqprofile == GST_VC1_DQPROFILE_DOUBLE_EDGE. The former dqbedge field is marked as unused and can be removed on the next gst-plugins-bad version that allows ABI changes. https://bugzilla.gnome.org/show_bug.cgi?id=692272 Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/gst/codecparsers/gstvc1parser.c2
-rw-r--r--gst-libs/gst/codecparsers/gstvc1parser.h12
2 files changed, 7 insertions, 7 deletions
diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c
index 559f8bc71..6630af8b5 100644
--- a/gst-libs/gst/codecparsers/gstvc1parser.c
+++ b/gst-libs/gst/codecparsers/gstvc1parser.c
@@ -646,7 +646,7 @@ parse_vopdquant (GstBitReader * br, GstVC1FrameHdr * framehdr, guint8 dquant)
switch (vopdquant->dqprofile) {
case GST_VC1_DQPROFILE_SINGLE_EDGE:
case GST_VC1_DQPROFILE_DOUBLE_EDGES:
- READ_UINT8 (br, vopdquant->dqsbedge, 2);
+ READ_UINT8 (br, vopdquant->dqbedge, 2);
break;
case GST_VC1_DQPROFILE_ALL_MBS:
diff --git a/gst-libs/gst/codecparsers/gstvc1parser.h b/gst-libs/gst/codecparsers/gstvc1parser.h
index c137cb698..f8d56d5a6 100644
--- a/gst-libs/gst/codecparsers/gstvc1parser.h
+++ b/gst-libs/gst/codecparsers/gstvc1parser.h
@@ -485,14 +485,14 @@ struct _GstVC1VopDquant
guint8 dquantfrm;
guint8 dqprofile;
- /* if dqprofile == GST_VC1_DQPROFILE_SINGLE_EDGE
- * or GST_VC1_DQPROFILE_DOUBLE_EDGE:*/
- guint8 dqsbedge;
-
- /* if dqprofile == GST_VC1_DQPROFILE_SINGLE_EDGE
- * or GST_VC1_DQPROFILE_DOUBLE_EDGE:*/
+ /* Boundary edge selection. This represents DQSBEDGE
+ * if dqprofile == GST_VC1_DQPROFILE_SINGLE_EDGE or
+ * DQDBEDGE if dqprofile == GST_VC1_DQPROFILE_DOUBLE_EDGE */
guint8 dqbedge;
+ /* FIXME: remove */
+ guint8 unused;
+
/* if dqprofile == GST_VC1_DQPROFILE_ALL_MBS */
guint8 dqbilevel;