← Back to branch summary

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

« back to all changes in this revision

Viewing changes to avidemux/ADM_editor/ADM_edit.hxx

  • Committer: Bazaar Package Importer
  • Author(s): Matvey Kozhev
  • Date: 2007-12-18 13:53:04 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20071218135304-cdqec2lg2bglyz15
Tags: 1:2.4~preview3-0.0ubuntu1
https://launchpad.net/bugs/163287
https://launchpad.net/bugs/126572
https://launchpad.net/bugs/138854
* Upload to Ubuntu. (LP: #163287, LP: #126572)
* debian/changelog: re-added Ubuntu releases.
* debian/control:
  - Require debhelper >= 5.0.51 (for dh_icons) and imagemagick.
  - Build-depend on libsdl1.2-dev instead of libsdl-dev.
  - Build against newer libx264-dev. (LP: #138854)
  - Removed libamrnb-dev, not in Ubuntu yet.
* debian/rules:
  - Install all icon sizes, using convert (upstream installs none).
  - Added missing calls to dh_installmenu, dh_installman, dh_icons and
    dh_desktop.
* debian/menu, debian/avidemux-qt.menu:
  - Corrected package and executable names.
* debian/avidemux-common.install: Install icons.
* debian/avidemux.common.manpages: Install man/avidemux.1.
* debian/links, debian/avidemux-cli.links, debian/avidemux-gtk.links:
  - Link manpages to avidemux.1.gz.
* debian/install, debian/avidemux-qt.install, debian/avidemux-gtk.desktop,
  debian/avidemux-qt.desktop: Install desktop files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/ADM_editor/ADM_edit.hxx
29
29
 ***************************************************************************/
30
30
 #ifndef __ADM_composer__
31
31
 #define __ADM_composer__
32
 
 #include "ADM_editor/ADM_Video.h"
33
 
 #include "ADM_codecs/ADM_codec.h"
34
 
 #include "ADM_library/ADM_image.h"
35
 
 #include "ADM_editor/ADM_edCache.h"
 
32
 #include "../ADM_editor/ADM_Video.h"
 
33
 #include "../ADM_codecs/ADM_codec.h"
 
34
 #include "ADM_image.h"
 
35
 #include "../ADM_editor/ADM_edCache.h"
36
36
 #include "ADM_pp.h"
37
37
 
38
38
#define MAX_SEG         100 // Should be enougth
57
57
                AvsProxy_FileType=15,
58
58
                Matroska_FileType=16,
59
59
                ASF_FileType=17,
 
60
                FLV_FileType=18,
 
61
                AMV_FileType=19,
60
62
                DUMMY_FILETYPE=99
61
63
}fileType;
62
64
 
125
127
                                        uint32_t  _audioseg;
126
128
                                        int64_t  _audioSample;
127
129
                                        uint32_t  _audiooffset;
128
 
                                        uint8_t    _cached;
129
130
                                        uint8_t    _haveMarkers; // used for load/save edl
130
131
 
131
132
                                        uint32_t _lastseg,_lastframe,_lastlen;
132
133
 
133
 
                                        _SEGMENT                _segments[MAX_SEG];
 
134
                                        uint32_t        max_seg;
 
135
                                        _SEGMENT                *_segments;
134
136
                                        _SEGMENT                _clipboard[MAX_SEG];
135
137
                                        _VIDEOS                 _videos[MAX_VIDEO];
136
138
                                        ADMImage                *_scratch;
159
161
                                                uint8_t hasVBRVideos(void);
160
162
                                                uint8_t addSegment(uint32_t source,uint32_t start, uint32_t nb);
161
163
                                                uint8_t deleteAllSegments(void);
162
 
                                                uint8_t activateCache( void ){ _cached=1;_lastseg=0xffffff;return 1;}
163
 
                                                uint8_t flushCache( void ){ _lastseg=0xffffff;return 1;}
164
 
                                                uint8_t desactivateCache( void ){ _cached=0;return 1;}
165
164
                                                uint8_t         getExtraHeaderData(uint32_t *len, uint8_t **data);
166
165
                                                uint32_t getPARWidth(void);
167
166
                                                uint32_t getPARHeight(void);
180
179
                                //_______________________
181
180
                                // specific to composer
182
181
                                //_______________________
183
 
                                                uint8_t         addFile(char *name,uint8_t mode=0);
 
182
                                                uint8_t         addFile (char *name, uint8_t mode=0,fileType forcedType=Unknown_FileType);
184
183
                                                uint8_t         cleanup( void);
185
184
                                                uint8_t         isMultiSeg( void) { if(_nb_segment>1) return 1; else return 0;}
186
185
                                                uint8_t         removeFrames(uint32_t start,uint32_t end);
196
195
                                                uint8_t         getRawStart(uint32_t frame,uint8_t *ptr,uint32_t *len);
197
196
 
198
197
 
199
 
                                                uint8_t         getFrameNoAlloc(uint32_t framenum,uint8_t *ptr,
200
 
                                                                                uint32_t* framelen,
201
 
                                                                                uint32_t *flags=0,  uint8_t *seq=0);
 
198
                                                uint8_t         getFrameNoAlloc(uint32_t framenum,
 
199
                                                                    ADMCompressedImage *img,  uint8_t *seq=0);
202
200
                                                uint32_t        getTime(uint32_t fn);
203
201
                                                uint32_t        getFlags(uint32_t frame,uint32_t *flags);
204
202
                                                uint8_t         isSequential (uint32_t framenum);
212
210
                                                uint8_t         getFrameSize(uint32_t frame,uint32_t *size) ;
213
211
                                                uint8_t         sanityCheckRef(uint32_t start, uint32_t end,
214
212
                                                                        uint32_t *fatal);
 
213
                                                uint8_t         hasPtsDts(uint32_t ); // Return 1 if the container gives PTS & DTS info
 
214
                                                uint32_t        ptsDtsDelta(uint32_t framenum) ;
215
215
                                        //*******************************************   
216
216
                                                uint32_t        getSpecificMpeg4Info( void );
217
217
                                        //______________________________