Changeset 4684

Show
Ignore:
Timestamp:
03/11/10 22:59:47 (4 years ago)
Author:
douglask
Message:

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

Location:
vic/branches/mpeg4/codec
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • vic/branches/mpeg4/codec/decoder-h264.cpp

    r4451 r4684  
    9292    /* 
    9393     * Assume CIF.  Picture header will trigger a resize if 
    94      * we encounter QCIF instead. 
     94     * we encounter another size instead. 
    9595     */ 
    9696    inw_ = 352; 
  • vic/branches/mpeg4/codec/decoder-mpeg4.cpp

    r4311 r4684  
    6868    /* 
    6969     * Assume CIF.  Picture header will trigger a resize if 
    70      * we encounter QCIF instead. 
     70     * we encounter another size instead. 
    7171     */ 
    7272    inw_ = 0; 
  • vic/branches/mpeg4/codec/encoder-h264.cpp

    r4539 r4684  
    6868encoder_matcher_h264; 
    6969 
    70 H264Encoder::H264Encoder():TransmitterModule(FT_YUV_CIF) 
     70H264Encoder::H264Encoder():TransmitterModule(FT_YUV_420) 
    7171{ 
    7272    enc = new x264Encoder(); 
     
    9595int H264Encoder::command(int argc, const char *const *argv) 
    9696{ 
    97     if (argc == 2) { 
    98         if (strcmp(argv[1], "frame-format") == 0) { 
    99             Tcl& tcl = Tcl::instance(); 
    100             tcl.result("420"); 
    101             return (TCL_OK); 
    102         } 
    103     } 
    104     else if (argc == 3) { 
     97    if (argc == 3) { 
    10598        if (strcmp(argv[1], "q") == 0) { 
    10699            gop = atoi(argv[2]); 
  • vic/branches/mpeg4/codec/encoder-mpeg4.cpp

    r4476 r4684  
    6363encoder_matcher_mpeg4; 
    6464 
    65 MPEG4Encoder::MPEG4Encoder():TransmitterModule(FT_YUV_CIF) 
     65MPEG4Encoder::MPEG4Encoder():TransmitterModule(FT_YUV_420) 
    6666{ 
    6767    state = false; 
     
    9191int MPEG4Encoder::command(int argc, const char *const *argv) 
    9292{ 
    93     if (argc == 2) { 
    94         if (strcmp(argv[1], "frame-format") == 0) { 
    95             Tcl& tcl = Tcl::instance(); 
    96             tcl.result("420"); 
    97             return (TCL_OK); 
    98         } 
    99     } 
    100     else if (argc == 3) { 
     93    if (argc == 3) { 
    10194        if (strcmp(argv[1], "q") == 0) { 
    10295            // mpeg4.quality = atoi(argv[2]);