Ticket #5156: programs_mythtranscode_mpeg2fix.cpp-spelling-errors.patch

File programs_mythtranscode_mpeg2fix.cpp-spelling-errors.patch, 6.1 KB (added by Erik Hovland <erik@…>, 12 years ago)

fixes spelling errors

  • programs/mythtranscode/mpeg2fix.cpp

    Fixes any discovered spelling errors in the file mpeg2fix.cpp
    
    From: Erik Hovland <erik@hovland.org>
    
    
    ---
    
     programs/mythtranscode/mpeg2fix.cpp |   26 +++++++++++++-------------
     1 files changed, 13 insertions(+), 13 deletions(-)
    
    diff --git a/programs/mythtranscode/mpeg2fix.cpp b/programs/mythtranscode/mpeg2fix.cpp
    index a6d93ef..f1ff181 100644
    a b int MPEG2fixup::BuildFrame(AVPacket *pkt, QString fname) 
    10751075    if (! out_codec)
    10761076    {
    10771077        free(picture);
    1078         VERBOSE(MPF_IMPORTANT, "Couldn't find MPEC2 encoder");
     1078        VERBOSE(MPF_IMPORTANT, "Couldn't find MPEG2 encoder");
    10791079        return 1;
    10801080    }
    10811081
    int MPEG2fixup::BuildFrame(AVPacket *pkt, QString fname) 
    10871087    c->dsp_mask = 0xffff;
    10881088
    10891089    //NOTE: The following may seem wrong, but avcodec requires
    1090     //sequence->progresive == frame->progressive
    1091     //We fix the discrepency by dsicarding avcodec's sequence header, and
     1090    //sequence->progressive == frame->progressive
     1091    //We fix the discrepancy by discarding avcodec's sequence header, and
    10921092    //replace it with the original
    10931093    if(picture->interlaced_frame)
    10941094        c->flags |= CODEC_FLAG_INTERLACED_DCT;
    int MPEG2fixup::Start() 
    19121912            displayFrame->toFirst();
    19131913
    19141914            // since we might reorder the frames when coming out of a cutpoint
    1915             // me need to save the first frame here, as it is gauranteed to
     1915            // me need to save the first frame here, as it is guaranteed to
    19161916            // have a sequence header.
    19171917            seqFrame = vFrame.current();
    19181918
    int MPEG2fixup::Start() 
    19791979                                           tmpPTSdiscrep, numframes, false);
    19801980                                if (!tmpPTSdiscrep)
    19811981                                {
    1982                                     //discrepency was short-lived, continue on
     1982                                    //discrepancy was short-lived, continue on
    19831983                                    done = true;
    19841984                                    PTSdiscrep = 0;
    19851985                                    break;
    int MPEG2fixup::Start() 
    21002100
    21012101                        if (deltaPTS < -2 || deltaPTS > 2)
    21022102                        {
    2103                             VERBOSE(MPF_PROCESS, QString("PTS discrepency: "
     2103                            VERBOSE(MPF_PROCESS, QString("PTS discrepancy: "
    21042104                                       "%1 != %2 on %3-Type (%4)")
    21052105                                       .arg(curFrame->pkt.pts)
    21062106                                       .arg(expectedvPTS / 300)
    int MPEG2fixup::Start() 
    21392139                            break;
    21402140                    }
    21412141
    2142                     //dtsExtra is applied at the end of this block iff the current
     2142                    //dtsExtra is applied at the end of this block if the current
    21432143                    //tail has repeat_first_field set
    21442144                    if (ptsorder_eq_dtsorder)
    21452145                        dtsExtra = 0;
    int MPEG2fixup::Start() 
    21512151                    {
    21522152                        //if we are off by more than 1/2 frame, it is time to add a frame
    21532153                        // The frame(s) will be added right after lVpkt_tail, and
    2154                         // lVpkt_head will be adjusted acordingly
     2154                        // lVpkt_head will be adjusted accordingly
    21552155
    21562156
    21572157                        vFrame.at(frame_pos)->pkt.pts = lastPTS / 300;
    int MPEG2fixup::Start() 
    22442244                    break;
    22452245
    22462246                // The order of processing frames is critical to making
    2247                 // everything work.  Backwards PTS discrepencies complicate
     2247                // everything work.  Backwards PTS discrepancies complicate
    22482248                // the processing significantly
    22492249                // Processing works as follows:
    22502250                //   detect whether there is a discontinuous PTS (tmpPTS != 0)
    int MPEG2fixup::Start() 
    22522252                //   next check if a cutpoint is active, and discard frames
    22532253                //     as needed
    22542254                //   next check that the current PTS < last video PTS
    2255                 //   if we get this far, update the expected PTS, and writeout
     2255                //   if we get this far, update the expected PTS, and write out
    22562256                //     the audio frame
    22572257                int64_t nextPTS, tmpPTS;
    22582258                int64_t incPTS =
    int MPEG2fixup::Start() 
    23002300                            {
    23012301                                //If there are 20 consecutive frames with an
    23022302                                //offset < 4sec, assume a mismatch and correct.
    2303                                 //Note: if we allow too much discrepency,
     2303                                //Note: if we allow too much discrepancy,
    23042304                                //we could overrun the video queue
    23052305                                ptsinc((uint64_t *)&origaPTS[it.key()],
    23062306                                       300 * tmpPTS);
    int MPEG2fixup::Start() 
    23112311                        }
    23122312                        af->first()->pkt.pts = origaPTS[it.key()] / 300;
    23132313                }
    2314                 else if (tmpPTS > incPTS) //correct for small discrepencies
     2314                else if (tmpPTS > incPTS) //correct for small discrepancies
    23152315                {
    23162316                    incPTS += incPTS;
    23172317                    backwardsPTS = false;
    void usage(char *s) 
    24042404    fprintf(stderr, "\t--maxframes #      -m #      : Max frames to insert at once (default=10)\n");
    24052405    fprintf(stderr, "\t--cutlist \"start - end\" -c : Apply a cutlist.  Specify on e'-c' per cut\n");
    24062406    fprintf(stderr, "\t--no3to2           -t        : Remove 3:2 pullup\n");
    2407     fprintf(stderr, "\t--fixup            -f        : make PTS contiuous\n");
     2407    fprintf(stderr, "\t--fixup            -f        : make PTS continuous\n");
    24082408    fprintf(stderr, "\t--ostream <dvd|ps> -e        : Output stream type (defaults to ps)\n");
    24092409    fprintf(stderr, "\t--showprogress     -p        : show progress\n");
    24102410    fprintf(stderr, "\t--help             -h        : This screen\n");