Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(363)

Side by Side Diff: source/patched-ffmpeg-mt/libavformat/spdif.c

Issue 2850032: ffmpeg update to june 23 version which fixes mp4 crash on still frames with 3... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/rtsp.c ('k') | source/patched-ffmpeg-mt/libavformat/udp.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * IEC958 muxer 2 * IEC958 muxer
3 * Copyright (c) 2009 Bartlomiej Wolowiec 3 * Copyright (c) 2009 Bartlomiej Wolowiec
4 * 4 *
5 * This file is part of FFmpeg. 5 * This file is part of FFmpeg.
6 * 6 *
7 * FFmpeg is free software; you can redistribute it and/or 7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version. 10 * version 2.1 of the License, or (at your option) any later version.
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 IEC958_MPEG1_LAYER1 = 0x04, ///< MPEG-1 layer 1 54 IEC958_MPEG1_LAYER1 = 0x04, ///< MPEG-1 layer 1
55 IEC958_MPEG1_LAYER23 = 0x05, ///< MPEG-1 layer 2 or 3 data or MPEG-2 without extension 55 IEC958_MPEG1_LAYER23 = 0x05, ///< MPEG-1 layer 2 or 3 data or MPEG-2 without extension
56 IEC958_MPEG2_EXT = 0x06, ///< MPEG-2 data with extension 56 IEC958_MPEG2_EXT = 0x06, ///< MPEG-2 data with extension
57 IEC958_MPEG2_AAC = 0x07, ///< MPEG-2 AAC ADTS 57 IEC958_MPEG2_AAC = 0x07, ///< MPEG-2 AAC ADTS
58 IEC958_MPEG2_LAYER1_LSF = 0x08, ///< MPEG-2, layer-1 low sampling frequency 58 IEC958_MPEG2_LAYER1_LSF = 0x08, ///< MPEG-2, layer-1 low sampling frequency
59 IEC958_MPEG2_LAYER2_LSF = 0x09, ///< MPEG-2, layer-2 low sampling frequency 59 IEC958_MPEG2_LAYER2_LSF = 0x09, ///< MPEG-2, layer-2 low sampling frequency
60 IEC958_MPEG2_LAYER3_LSF = 0x0A, ///< MPEG-2, layer-3 low sampling frequency 60 IEC958_MPEG2_LAYER3_LSF = 0x0A, ///< MPEG-2, layer-3 low sampling frequency
61 IEC958_DTS1 = 0x0B, ///< DTS type I (512 samples) 61 IEC958_DTS1 = 0x0B, ///< DTS type I (512 samples)
62 IEC958_DTS2 = 0x0C, ///< DTS type II (1024 samples) 62 IEC958_DTS2 = 0x0C, ///< DTS type II (1024 samples)
63 IEC958_DTS3 = 0x0D, ///< DTS type III (2048 samples) 63 IEC958_DTS3 = 0x0D, ///< DTS type III (2048 samples)
64 IEC958_ATRAC = 0x0E, ///< Atrac data
65 IEC958_ATRAC3 = 0x0F, ///< Atrac 3 data
66 IEC958_ATRACX = 0x10, ///< Atrac 3 plus data
67 IEC958_DTSHD = 0x11, ///< DTS HD data
68 IEC958_WMAPRO = 0x12, ///< WMA 9 Professional data
64 IEC958_MPEG2_AAC_LSF_2048 = 0x13, ///< MPEG-2 AAC ADTS half-rate lo w sampling frequency 69 IEC958_MPEG2_AAC_LSF_2048 = 0x13, ///< MPEG-2 AAC ADTS half-rate lo w sampling frequency
65 IEC958_MPEG2_AAC_LSF_4096 = 0x13 | 0x20, ///< MPEG-2 AAC ADTS quarter-rate low sampling frequency 70 IEC958_MPEG2_AAC_LSF_4096 = 0x13 | 0x20, ///< MPEG-2 AAC ADTS quarter-rate low sampling frequency
71 IEC958_EAC3 = 0x15, ///< E-AC-3 data
72 IEC958_TRUEHD = 0x16, ///< TrueHD data
66 }; 73 };
67 74
68 typedef struct IEC958Context { 75 typedef struct IEC958Context {
69 enum IEC958DataType data_type; ///< burst info - reference to type of paylo ad of the data-burst 76 enum IEC958DataType data_type; ///< burst info - reference to type of paylo ad of the data-burst
70 int pkt_size; ///< length code in bits 77 int pkt_size; ///< length code in bits
71 int pkt_offset; ///< data burst repetition period in bytes 78 int pkt_offset; ///< data burst repetition period in bytes
72 uint8_t *buffer; ///< allocated buffer, used for swap bytes 79 uint8_t *buffer; ///< allocated buffer, used for swap bytes
73 int buffer_size; ///< size of allocated buffer 80 int buffer_size; ///< size of allocated buffer
74 81
75 /// function, which generates codec dependent header information. 82 /// function, which generates codec dependent header information.
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 NULL_IF_CONFIG_SMALL("IEC958 - S/PDIF (IEC-61937)"), 304 NULL_IF_CONFIG_SMALL("IEC958 - S/PDIF (IEC-61937)"),
298 NULL, 305 NULL,
299 "spdif", 306 "spdif",
300 sizeof(IEC958Context), 307 sizeof(IEC958Context),
301 CODEC_ID_AC3, 308 CODEC_ID_AC3,
302 CODEC_ID_NONE, 309 CODEC_ID_NONE,
303 spdif_write_header, 310 spdif_write_header,
304 spdif_write_packet, 311 spdif_write_packet,
305 spdif_write_trailer, 312 spdif_write_trailer,
306 }; 313 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/rtsp.c ('k') | source/patched-ffmpeg-mt/libavformat/udp.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698