[Sumover-dev] [svn commit] r4476 - in vic/branches/mpeg4: codec

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

Author: douglask
Date: Mon Jul 13 12:05:31 2009
New Revision: 4476

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

Log:
Ensure that the H264 and MPEG4 encoders let VIC know that their frame format is YUV 420 (not CIF).

Modified: vic/branches/mpeg4/codec/encoder-h264.cpp
==============================================================================
--- vic/branches/mpeg4/codec/encoder-h264.cpp	(original)
+++ vic/branches/mpeg4/codec/encoder-h264.cpp	Mon Jul 13 12:05:31 2009
@@ -94,7 +94,14 @@
 
 int H264Encoder::command(int argc, const char *const *argv)
 {
-    if (argc == 3) {
+    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 (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	Mon Jul 13 12:05:31 2009
@@ -90,7 +90,14 @@
 
 int MPEG4Encoder::command(int argc, const char *const *argv)
 {
-    if (argc == 3) {
+    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 (strcmp(argv[1], "q") == 0) {
 	    // mpeg4.quality = atoi(argv[2]);
 	    // mpeg4.set_max_quantizer(mpeg4.quality);

Modified: vic/branches/mpeg4/module.cpp
==============================================================================
--- vic/branches/mpeg4/module.cpp	(original)
+++ vic/branches/mpeg4/module.cpp	Mon Jul 13 12:05:31 2009
@@ -46,6 +46,8 @@
 	case FT_RAW:	  return ("raw");
 	case FT_LDCT:	  return ("ldct");
 	case FT_PVH:	  return ("pvh");
+	case FT_H264:	  return ("h264");
+	case FT_MPEG4:	  return ("mpeg4");
 	}
 	return ("");
 }
@@ -72,6 +74,10 @@
 		return FT_LDCT;
 	if (strcasecmp(s, "pvh") == 0)
 		return FT_PVH;
+	if (strcasecmp(s, "h264") == 0)
+		return FT_H264;
+	if (strcasecmp(s, "mpeg4") == 0)
+		return FT_MPEG4;
 	return (-1);
 }
 

Modified: vic/branches/mpeg4/module.h
==============================================================================
--- vic/branches/mpeg4/module.h	(original)
+++ vic/branches/mpeg4/module.h	Mon Jul 13 12:05:31 2009
@@ -110,6 +110,8 @@
 #define FT_RAW		7
 #define FT_LDCT		8
 #define FT_PVH		9
+#define FT_H264		10
+#define FT_MPEG4	11
 
 class Module : public TclObject {
     public: