[Sumover-dev] [svn commit] r4684 - vic/branches/mpeg4/codec

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Thu Mar 11 22:59:47 2010
New Revision: 4684

Modified:
   vic/branches/mpeg4/codec/decoder-h264.cpp
   vic/branches/mpeg4/codec/decoder-mpeg4.cpp
   vic/branches/mpeg4/codec/encoder-h264.cpp
   vic/branches/mpeg4/codec/encoder-mpeg4.cpp

Log:
correct h264 and mpeg4 to correctly use FT_YUV_420 instead of FT_YUV_CIF, removed a former patch which did it an incorrect way


Modified: vic/branches/mpeg4/codec/decoder-h264.cpp
==============================================================================
--- vic/branches/mpeg4/codec/decoder-h264.cpp	(original)
+++ vic/branches/mpeg4/codec/decoder-h264.cpp	Thu Mar 11 22:59:47 2010
@@ -91,7 +91,7 @@
     decimation_ = 420;
     /*
      * Assume CIF.  Picture header will trigger a resize if
-     * we encounter QCIF instead.
+     * we encounter another size instead.
      */
     inw_ = 352;
     inh_ = 288;

Modified: vic/branches/mpeg4/codec/decoder-mpeg4.cpp
==============================================================================
--- vic/branches/mpeg4/codec/decoder-mpeg4.cpp	(original)
+++ vic/branches/mpeg4/codec/decoder-mpeg4.cpp	Thu Mar 11 22:59:47 2010
@@ -67,7 +67,7 @@
     decimation_ = 420;
     /*
      * Assume CIF.  Picture header will trigger a resize if
-     * we encounter QCIF instead.
+     * we encounter another size instead.
      */
     inw_ = 0;
     inh_ = 0;

Modified: vic/branches/mpeg4/codec/encoder-h264.cpp
==============================================================================
--- vic/branches/mpeg4/codec/encoder-h264.cpp	(original)
+++ vic/branches/mpeg4/codec/encoder-h264.cpp	Thu Mar 11 22:59:47 2010
@@ -67,7 +67,7 @@
 
 encoder_matcher_h264;
 
-H264Encoder::H264Encoder():TransmitterModule(FT_YUV_CIF)
+H264Encoder::H264Encoder():TransmitterModule(FT_YUV_420)
 {
     enc = new x264Encoder();
     state = false;
@@ -94,14 +94,7 @@
 
 int H264Encoder::command(int argc, const char *const *argv)
 {
-    if (argc == 2) {
-	if (strcmp(argv[1], "frame-format") == 0) {
-	    Tcl& tcl = Tcl::instance();
-	    tcl.result("420");
-	    return (TCL_OK);
-	}
-    }
-    else if (argc == 3) {
+    if (argc == 3) {
 	if (strcmp(argv[1], "q") == 0) {
 	    gop = atoi(argv[2]);
 	    return (TCL_OK);

Modified: vic/branches/mpeg4/codec/encoder-mpeg4.cpp
==============================================================================
--- vic/branches/mpeg4/codec/encoder-mpeg4.cpp	(original)
+++ vic/branches/mpeg4/codec/encoder-mpeg4.cpp	Thu Mar 11 22:59:47 2010
@@ -62,7 +62,7 @@
 
 encoder_matcher_mpeg4;
 
-MPEG4Encoder::MPEG4Encoder():TransmitterModule(FT_YUV_CIF)
+MPEG4Encoder::MPEG4Encoder():TransmitterModule(FT_YUV_420)
 {
     state = false;
     mpeg4.init(true, CODEC_ID_MPEG4, PIX_FMT_YUV420P);
@@ -90,14 +90,7 @@
 
 int MPEG4Encoder::command(int argc, const char *const *argv)
 {
-    if (argc == 2) {
-	if (strcmp(argv[1], "frame-format") == 0) {
-	    Tcl& tcl = Tcl::instance();
-	    tcl.result("420");
-	    return (TCL_OK);
-	}
-    }
-    else if (argc == 3) {
+    if (argc == 3) {
 	if (strcmp(argv[1], "q") == 0) {
 	    // mpeg4.quality = atoi(argv[2]);
 	    // mpeg4.set_max_quantizer(mpeg4.quality);