← Back to branch summary

~ubuntu-branches/ubuntu/hardy/avidemux/hardy

« back to all changes in this revision

Viewing changes to avidemux/ADM_mpegdemuxer/dmx_video.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2006-12-15 17:13:20 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20061215171320-w79pvpehxx2fr217
Tags: 1:2.3.0-0.0ubuntu1
* Merge from debian-multimedia.org, remaining Ubuntu change:
  - desktop file,
  - no support for ccache and make -j.
* Closes Ubuntu: #69614.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/ADM_mpegdemuxer/dmx_video.cpp
40
40
#include "dmx_demuxerEs.h"
41
41
#include "dmx_demuxerPS.h"
42
42
#include "dmx_demuxerTS.h"
 
43
#include "dmx_demuxerMSDVR.h"
43
44
 
44
45
#include "dmx_video.h"
45
46
#include "dmx_audio.h"
63
64
        _index=NULL;
64
65
        _audioStream=NULL;
65
66
        _fieldEncoded=0;
66
 
 
 
67
        demuxer=NULL;
67
68
}
68
69
//
69
70
// Delete everything associated (cache...demuxer...)
263
264
                
264
265
                switch(type)
265
266
                {
 
267
                        case 'M':
 
268
                                {
 
269
                                  MPEG_TRACK track;
 
270
                                  track.pid=vTsId;
 
271
                                  track.pes=vPid;
 
272
                                  demuxer=new dmx_demuxerMSDVR(1,&track,0);
 
273
                                  break;
 
274
                                }
266
275
                        case 'T' :
267
276
                                {
268
277
                                        MPEG_TRACK track;
300
309
                _index=new dmxIndex[_nbFrames+1];
301
310
                if(!_index)
302
311
                        {
303
 
                                        GUI_Error_HIG("Out of memory", NULL);
 
312
                          GUI_Error_HIG(_("Out of memory"), NULL);
304
313
                                        ADM_assert(0);
305
314
                        }
306
315
                memset(_index,0,_nbFrames*sizeof(dmxIndex));
473
482
                        // switch DTS->PTS
474
483
                        if(!renumber())
475
484
                        {
476
 
                                GUI_Error_HIG("MPEG renumbering error", NULL);
 
485
                          GUI_Error_HIG(_("MPEG renumbering error"), NULL);
477
486
                                return 0;
478
487
                        }
479
488
                        //Dump();
480
 
                        if(type=='P' || type=='T')
 
489
                        if(type=='P' || type=='T' || type=='M')
481
490
                        {
482
491
                                // We have potentially some audio
483
492
                                // Try to get it
632
641
  if(!_audioStream) return 0;
633
642
  return _audioStream->currentTrack;
634
643
}
635
 
uint8_t  dmxHeader::getAudioStreamsInfo(uint32_t *nbStreams, uint32_t **infos)
 
644
uint8_t  dmxHeader::getAudioStreamsInfo(uint32_t *nbStreams, audioInfo **infos)
636
645
{
637
646
    if(!_audioStream)
638
647
    {