change path pattern to be similar to existing files, and remove useless buffer
Originally committed as revision 17896 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier
parent
4070629dfa
commit
6b4fab72df
@ -97,8 +97,8 @@ static const AVCodecTag gxf_media_types[] = {
|
||||
{ 0, 0 },
|
||||
};
|
||||
|
||||
#define SERVER_PATH "/space/"
|
||||
#define ES_NAME_PATTERN "ES."
|
||||
#define SERVER_PATH "EXT:/PDR/default/"
|
||||
#define ES_NAME_PATTERN "EXT:/PDR/default/ES."
|
||||
|
||||
static int gxf_find_lines_index(AVStream *st)
|
||||
{
|
||||
@ -529,22 +529,19 @@ static int gxf_write_umf_media_description(AVFormatContext *s)
|
||||
GXFContext *gxf = s->priv_data;
|
||||
ByteIOContext *pb = s->pb;
|
||||
int64_t pos;
|
||||
int i;
|
||||
int i, j;
|
||||
|
||||
pos = url_ftell(pb);
|
||||
gxf->umf_media_offset = pos - gxf->umf_start_offset;
|
||||
for (i = 0; i <= s->nb_streams; ++i) {
|
||||
GXFStreamContext *sc;
|
||||
char buffer[88];
|
||||
int64_t startpos, curpos;
|
||||
int path_size = strlen(ES_NAME_PATTERN);
|
||||
|
||||
if (i == s->nb_streams)
|
||||
sc = &gxf->timecode_track;
|
||||
else
|
||||
sc = s->streams[i]->priv_data;
|
||||
|
||||
memset(buffer, 0, 88);
|
||||
startpos = url_ftell(pb);
|
||||
put_le16(pb, 0); /* length */
|
||||
put_le16(pb, sc->media_info);
|
||||
@ -554,10 +551,10 @@ static int gxf_write_umf_media_description(AVFormatContext *s)
|
||||
put_le32(pb, 0); /* attributes rw, ro */
|
||||
put_le32(pb, 0); /* mark in */
|
||||
put_le32(pb, gxf->nb_fields); /* mark out */
|
||||
strncpy(buffer, ES_NAME_PATTERN, path_size);
|
||||
put_buffer(pb, (uint8_t *)buffer, path_size);
|
||||
put_buffer(pb, ES_NAME_PATTERN, sizeof(ES_NAME_PATTERN));
|
||||
put_be16(pb, sc->media_info);
|
||||
put_buffer(pb, (uint8_t *)buffer + path_size + 2, 88 - path_size - 2);
|
||||
for (j = sizeof(ES_NAME_PATTERN)+2; j < 88; j++)
|
||||
put_byte(pb, 0);
|
||||
put_le32(pb, sc->track_type);
|
||||
put_le32(pb, sc->sample_rate);
|
||||
put_le32(pb, sc->sample_size);
|
||||
|
||||
@ -27,8 +27,8 @@ af78858062599fcbba049e4a02588a15 *./tests/data/b-libav.mov
|
||||
913b6199765b1dcba196706574621c2f *./tests/data/b-libav.dv
|
||||
3600000 ./tests/data/b-libav.dv
|
||||
./tests/data/b-libav.dv CRC=0x7787e173
|
||||
71434c75f12f6f54f9cd8b86107a2c75 *./tests/data/b-libav.gxf
|
||||
810208 ./tests/data/b-libav.gxf
|
||||
1623fca05b137d378bffd5050bcb9eb3 *./tests/data/b-libav.gxf
|
||||
810268 ./tests/data/b-libav.gxf
|
||||
./tests/data/b-libav.gxf CRC=0x9c06676e
|
||||
66a6584f9e83e8ea3af822a3ba71fbbe *./tests/data/b-libav.nut
|
||||
329264 ./tests/data/b-libav.nut
|
||||
|
||||
@ -2907,59 +2907,59 @@ ret:-22 st:-1 ts:0.460008 flags:0
|
||||
ret:-22 st:-1 ts:-0.645825 flags:1
|
||||
----------------
|
||||
tests/data/b-libav.gxf
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:4964 size:65536 flags:1
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:5024 size:65536 flags:1
|
||||
ret: 0 st:-1 ts:-1.000000 flags:0
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:4964 size:65536 flags:1
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:5024 size:65536 flags:1
|
||||
ret: 0 st:-1 ts:1.894167 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755872 size:54320 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755932 size:54320 flags:1
|
||||
ret: 0 st: 0 ts:0.780000 flags:0
|
||||
ret: 0 st: 0 dts:0.800000 pts:-184467440737095520.000000 pos:665572 size:22568 flags:0
|
||||
ret: 0 st: 0 dts:0.800000 pts:-184467440737095520.000000 pos:665632 size:22568 flags:0
|
||||
ret: 0 st: 0 ts:-0.320000 flags:1
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:4964 size:65536 flags:1
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:5024 size:65536 flags:1
|
||||
ret: 0 st: 1 ts:2.580000 flags:0
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755872 size:54320 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755932 size:54320 flags:1
|
||||
ret: 0 st: 1 ts:1.480000 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755872 size:54320 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755932 size:54320 flags:1
|
||||
ret: 0 st: 2 ts:0.360000 flags:0
|
||||
ret: 0 st: 0 dts:0.360000 pts:-184467440737095520.000000 pos:308108 size:23176 flags:0
|
||||
ret: 0 st: 0 dts:0.360000 pts:-184467440737095520.000000 pos:308168 size:23176 flags:0
|
||||
ret: 0 st: 2 ts:-0.740000 flags:1
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:4964 size:65536 flags:1
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:5024 size:65536 flags:1
|
||||
ret: 0 st:-1 ts:2.153336 flags:0
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755872 size:54320 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755932 size:54320 flags:1
|
||||
ret: 0 st:-1 ts:1.047503 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755872 size:54320 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755932 size:54320 flags:1
|
||||
ret: 0 st: 0 ts:-0.060000 flags:0
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:4964 size:65536 flags:1
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:5024 size:65536 flags:1
|
||||
ret: 0 st: 0 ts:2.840000 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755872 size:54320 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755932 size:54320 flags:1
|
||||
ret: 0 st: 1 ts:1.740000 flags:0
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755872 size:54320 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755932 size:54320 flags:1
|
||||
ret: 0 st: 1 ts:0.620000 flags:1
|
||||
ret: 0 st: 0 dts:0.640000 pts:-184467440737095520.000000 pos:504144 size:22976 flags:0
|
||||
ret: 0 st: 0 dts:0.640000 pts:-184467440737095520.000000 pos:504204 size:22976 flags:0
|
||||
ret: 0 st: 2 ts:-0.480000 flags:0
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:4964 size:65536 flags:1
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:5024 size:65536 flags:1
|
||||
ret: 0 st: 2 ts:2.420000 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755872 size:54320 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755932 size:54320 flags:1
|
||||
ret: 0 st:-1 ts:1.306672 flags:0
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755872 size:54320 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755932 size:54320 flags:1
|
||||
ret: 0 st:-1 ts:0.200839 flags:1
|
||||
ret: 0 st: 0 dts:0.200000 pts:-184467440737095520.000000 pos:215268 size:20944 flags:0
|
||||
ret: 0 st: 0 dts:0.200000 pts:-184467440737095520.000000 pos:215328 size:20944 flags:0
|
||||
ret: 0 st: 0 ts:-0.900000 flags:0
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:4964 size:65536 flags:1
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:5024 size:65536 flags:1
|
||||
ret: 0 st: 0 ts:1.980000 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755872 size:54320 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755932 size:54320 flags:1
|
||||
ret: 0 st: 1 ts:0.880000 flags:0
|
||||
ret: 0 st: 0 dts:0.880000 pts:-184467440737095520.000000 pos:710988 size:22456 flags:0
|
||||
ret: 0 st: 0 dts:0.880000 pts:-184467440737095520.000000 pos:711048 size:22456 flags:0
|
||||
ret: 0 st: 1 ts:-0.220000 flags:1
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:4964 size:65536 flags:1
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:5024 size:65536 flags:1
|
||||
ret: 0 st: 2 ts:2.680000 flags:0
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755872 size:54320 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755932 size:54320 flags:1
|
||||
ret: 0 st: 2 ts:1.560000 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755872 size:54320 flags:1
|
||||
ret: 0 st: 0 dts:0.960000 pts:-184467440737095520.000000 pos:755932 size:54320 flags:1
|
||||
ret: 0 st:-1 ts:0.460008 flags:0
|
||||
ret: 0 st: 0 dts:0.480000 pts:-184467440737095520.000000 pos:375732 size:53804 flags:1
|
||||
ret: 0 st: 0 dts:0.480000 pts:-184467440737095520.000000 pos:375792 size:53804 flags:1
|
||||
ret: 0 st:-1 ts:-0.645825 flags:1
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:4964 size:65536 flags:1
|
||||
ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:5024 size:65536 flags:1
|
||||
----------------
|
||||
tests/data/b-libav.mkv
|
||||
ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:505 size:28088 flags:1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user