Skip to content

F
ffmpeg.wasm-core
Commit fadf8459 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '48a4ffa7' 

* commit '48a4ffa7':
  asf: K&R formatting cosmetics
  vc1dec: use codec_id instead of codec_tag for VC1IMAGE
  sh4: drop unused functions

Conflicts:
	libavformat/asf.c
	libavformat/asfdec.c
	libavformat/asfenc.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 7af876a9 48a4ffa7
Show whitespace changes
Inline Side-by-side
Showing with 535 additions and 525 deletions
libavcodec/sh4/dsputil_align.c
View file @ fadf8459
...@@ -65,34 +65,6 @@ ...@@ -65,34 +65,6 @@
dest+=stride; \ dest+=stride; \
} while(--height) } while(--height)
#define OP put
static void put_pixels4_c(uint8_t *dest,const uint8_t *ref, const int stride,int height)
{
switch((int)ref&3){
case 0: OP_C40(); return;
case 1: OP_C4(1); return;
case 2: OP_C4(2); return;
case 3: OP_C4(3); return;
}
}
#undef OP
#define OP avg
static void avg_pixels4_c(uint8_t *dest,const uint8_t *ref, const int stride,int height)
{
switch((int)ref&3){
case 0: OP_C40(); return;
case 1: OP_C4(1); return;
case 2: OP_C4(2); return;
case 3: OP_C4(3); return;
}
}
#undef OP
#define OP_C(ofs,sz,avg2) \ #define OP_C(ofs,sz,avg2) \
{ \ { \
ref-=ofs; \ ref-=ofs; \
......
libavcodec/vc1dec.c
View file @ fadf8459
...@@ -5262,7 +5262,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) ...@@ -5262,7 +5262,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "Incomplete extradata\n"); av_log(avctx, AV_LOG_ERROR, "Incomplete extradata\n");
return -1; return -1;
} }
v->res_sprite = (avctx->codec_tag == MKTAG('W','V','P','2')); v->res_sprite = (avctx->codec_id == AV_CODEC_ID_VC1IMAGE);
} }
avctx->profile = v->profile; avctx->profile = v->profile;
......
libavformat/asf.c
View file @ fadf8459
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include "asf.h" #include "asf.h"
const ff_asf_guid ff_asf_header = { const ff_asf_guid ff_asf_header = {
0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C 0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C
}; };
...@@ -115,7 +114,7 @@ const ff_asf_guid ff_asf_marker_header = { ...@@ -115,7 +114,7 @@ const ff_asf_guid ff_asf_marker_header = {
}; };
/* I am not a number !!! This GUID is the one found on the PC used to /* I am not a number !!! This GUID is the one found on the PC used to
generate the stream */ * generate the stream */
const ff_asf_guid ff_asf_my_guid = { const ff_asf_guid ff_asf_my_guid = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
}; };
...@@ -138,20 +137,20 @@ const ff_asf_guid ff_asf_digital_signature = { ...@@ -138,20 +137,20 @@ const ff_asf_guid ff_asf_digital_signature = {
/* List of official tags at http://msdn.microsoft.com/en-us/library/dd743066(VS.85).aspx */ /* List of official tags at http://msdn.microsoft.com/en-us/library/dd743066(VS.85).aspx */
const AVMetadataConv ff_asf_metadata_conv[] = { const AVMetadataConv ff_asf_metadata_conv[] = {
{ "WM/AlbumArtist" , "album_artist"}, { "WM/AlbumArtist", "album_artist" },
{ "WM/AlbumTitle" , "album" }, { "WM/AlbumTitle", "album" },
{ "Author" , "artist" }, { "Author", "artist" },
{ "Description" , "comment" }, { "Description", "comment" },
{ "WM/Composer" , "composer" }, { "WM/Composer", "composer" },
{ "WM/EncodedBy" , "encoded_by" }, { "WM/EncodedBy", "encoded_by" },
{ "WM/EncodingSettings", "encoder" }, { "WM/EncodingSettings", "encoder" },
{ "WM/Genre" , "genre" }, { "WM/Genre", "genre" },
{ "WM/Language" , "language" }, { "WM/Language", "language" },
{ "WM/OriginalFilename", "filename" }, { "WM/OriginalFilename", "filename" },
{ "WM/PartOfSet" , "disc" }, { "WM/PartOfSet", "disc" },
{ "WM/Publisher" , "publisher" }, { "WM/Publisher", "publisher" },
{ "WM/Tool" , "encoder" }, { "WM/Tool", "encoder" },
{ "WM/TrackNumber" , "track" }, { "WM/TrackNumber", "track" },
{ "WM/MediaStationCallSign", "service_provider" }, { "WM/MediaStationCallSign", "service_provider" },
{ "WM/MediaStationName", "service_name" }, { "WM/MediaStationName", "service_name" },
// { "Year" , "date" }, TODO: conversion year<->date // { "Year" , "date" }, TODO: conversion year<->date
......
libavformat/asfcrypt.c
View file @ fadf8459
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "libavutil/common.h"
#include "libavutil/des.h" #include "libavutil/des.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/rc4.h" #include "libavutil/rc4.h"
#include "asfcrypt.h" #include "asfcrypt.h"
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
* @param v number to invert, must be odd! * @param v number to invert, must be odd!
* @return number so that result * v = 1 (mod 2^32) * @return number so that result * v = 1 (mod 2^32)
*/ */
static uint32_t inverse(uint32_t v) { static uint32_t inverse(uint32_t v)
{
// v ^ 3 gives the inverse (mod 16), could also be implemented // v ^ 3 gives the inverse (mod 16), could also be implemented
// as table etc. (only lowest 4 bits matter!) // as table etc. (only lowest 4 bits matter!)
uint32_t inverse = v * v * v; uint32_t inverse = v * v * v;
...@@ -50,7 +51,8 @@ static uint32_t inverse(uint32_t v) { ...@@ -50,7 +51,8 @@ static uint32_t inverse(uint32_t v) {
* @param keys output key array containing the keys for encryption in * @param keys output key array containing the keys for encryption in
* native endianness * native endianness
*/ */
static void multiswap_init(const uint8_t keybuf[48], uint32_t keys[12]) { static void multiswap_init(const uint8_t keybuf[48], uint32_t keys[12])
{
int i; int i;
for (i = 0; i < 12; i++) for (i = 0; i < 12; i++)
keys[i] = AV_RL32(keybuf + (i << 2)) | 1; keys[i] = AV_RL32(keybuf + (i << 2)) | 1;
...@@ -61,7 +63,8 @@ static void multiswap_init(const uint8_t keybuf[48], uint32_t keys[12]) { ...@@ -61,7 +63,8 @@ static void multiswap_init(const uint8_t keybuf[48], uint32_t keys[12]) {
* the other way round. * the other way round.
* @param keys key array of ints to invert * @param keys key array of ints to invert
*/ */
static void multiswap_invert_keys(uint32_t keys[12]) { static void multiswap_invert_keys(uint32_t keys[12])
{
int i; int i;
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
keys[i] = inverse(keys[i]); keys[i] = inverse(keys[i]);
...@@ -69,7 +72,8 @@ static void multiswap_invert_keys(uint32_t keys[12]) { ...@@ -69,7 +72,8 @@ static void multiswap_invert_keys(uint32_t keys[12]) {
keys[i] = inverse(keys[i]); keys[i] = inverse(keys[i]);
} }
static uint32_t multiswap_step(const uint32_t keys[12], uint32_t v) { static uint32_t multiswap_step(const uint32_t keys[12], uint32_t v)
{
int i; int i;
v *= keys[0]; v *= keys[0];
for (i = 1; i < 5; i++) { for (i = 1; i < 5; i++) {
...@@ -80,7 +84,8 @@ static uint32_t multiswap_step(const uint32_t keys[12], uint32_t v) { ...@@ -80,7 +84,8 @@ static uint32_t multiswap_step(const uint32_t keys[12], uint32_t v) {
return v; return v;
} }
static uint32_t multiswap_inv_step(const uint32_t keys[12], uint32_t v) { static uint32_t multiswap_inv_step(const uint32_t keys[12], uint32_t v)
{
int i; int i;
v -= keys[5]; v -= keys[5];
for (i = 4; i > 0; i--) { for (i = 4; i > 0; i--) {
...@@ -99,13 +104,15 @@ static uint32_t multiswap_inv_step(const uint32_t keys[12], uint32_t v) { ...@@ -99,13 +104,15 @@ static uint32_t multiswap_inv_step(const uint32_t keys[12], uint32_t v) {
* @param data data to encrypt * @param data data to encrypt
* @return encrypted data * @return encrypted data
*/ */
static uint64_t multiswap_enc(const uint32_t keys[12], uint64_t key, uint64_t data) { static uint64_t multiswap_enc(const uint32_t keys[12],
uint64_t key, uint64_t data)
{
uint32_t a = data; uint32_t a = data;
uint32_t b = data >> 32; uint32_t b = data >> 32;
uint32_t c; uint32_t c;
uint32_t tmp; uint32_t tmp;
a += key; a += key;
tmp = multiswap_step(keys , a); tmp = multiswap_step(keys, a);
b += tmp; b += tmp;
c = (key >> 32) + tmp; c = (key >> 32) + tmp;
tmp = multiswap_step(keys + 6, b); tmp = multiswap_step(keys + 6, b);
...@@ -121,7 +128,9 @@ static uint64_t multiswap_enc(const uint32_t keys[12], uint64_t key, uint64_t da ...@@ -121,7 +128,9 @@ static uint64_t multiswap_enc(const uint32_t keys[12], uint64_t key, uint64_t da
* @param data data to decrypt * @param data data to decrypt
* @return decrypted data * @return decrypted data
*/ */
static uint64_t multiswap_dec(const uint32_t keys[12], uint64_t key, uint64_t data) { static uint64_t multiswap_dec(const uint32_t keys[12],
uint64_t key, uint64_t data)
{
uint32_t a; uint32_t a;
uint32_t b; uint32_t b;
uint32_t c = data >> 32; uint32_t c = data >> 32;
...@@ -130,12 +139,13 @@ static uint64_t multiswap_dec(const uint32_t keys[12], uint64_t key, uint64_t da ...@@ -130,12 +139,13 @@ static uint64_t multiswap_dec(const uint32_t keys[12], uint64_t key, uint64_t da
b = multiswap_inv_step(keys + 6, tmp); b = multiswap_inv_step(keys + 6, tmp);
tmp = c - (key >> 32); tmp = c - (key >> 32);
b -= tmp; b -= tmp;
a = multiswap_inv_step(keys , tmp); a = multiswap_inv_step(keys, tmp);
a -= key; a -= key;
return ((uint64_t)b << 32) | a; return ((uint64_t)b << 32) | a;
} }
void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len) { void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len)
{
struct AVDES des; struct AVDES des;
struct AVRC4 rc4; struct AVRC4 rc4;
int num_qwords = len >> 3; int num_qwords = len >> 3;
...@@ -155,7 +165,7 @@ void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len) { ...@@ -155,7 +165,7 @@ void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len) {
av_rc4_crypt(&rc4, (uint8_t *)rc4buff, NULL, sizeof(rc4buff), NULL, 1); av_rc4_crypt(&rc4, (uint8_t *)rc4buff, NULL, sizeof(rc4buff), NULL, 1);
multiswap_init((uint8_t *)rc4buff, ms_keys); multiswap_init((uint8_t *)rc4buff, ms_keys);
packetkey = AV_RN64(&qwords[num_qwords*8 - 8]); packetkey = AV_RN64(&qwords[num_qwords * 8 - 8]);
packetkey ^= rc4buff[7]; packetkey ^= rc4buff[7];
av_des_init(&des, key + 12, 64, 1); av_des_init(&des, key + 12, 64, 1);
av_des_crypt(&des, (uint8_t *)&packetkey, (uint8_t *)&packetkey, 1, NULL, 1); av_des_crypt(&des, (uint8_t *)&packetkey, (uint8_t *)&packetkey, 1, NULL, 1);
......
libavformat/asfdec.c
View file @ fadf8459
...@@ -22,20 +22,20 @@ ...@@ -22,20 +22,20 @@
//#define DEBUG //#define DEBUG
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/avstring.h"
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/avstring.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h"
#include "avio_internal.h" #include "avio_internal.h"
#include "avlanguage.h"
#include "id3v2.h" #include "id3v2.h"
#include "internal.h"
#include "riff.h" #include "riff.h"
#include "asf.h" #include "asf.h"
#include "asfcrypt.h" #include "asfcrypt.h"
#include "avlanguage.h"
typedef struct { typedef struct {
const AVClass *class; const AVClass *class;
...@@ -75,13 +75,13 @@ typedef struct { ...@@ -75,13 +75,13 @@ typedef struct {
int stream_index; int stream_index;
ASFStream* asf_st; ///< currently decoded stream ASFStream *asf_st; ///< currently decoded stream
int no_resync_search; int no_resync_search;
} ASFContext; } ASFContext;
static const AVOption options[] = { static const AVOption options[] = {
{"no_resync_search", "Don't try to resynchronize by looking for a certain optional start code", offsetof(ASFContext, no_resync_search), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, { "no_resync_search", "Don't try to resynchronize by looking for a certain optional start code", offsetof(ASFContext, no_resync_search), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
{ NULL }, { NULL },
}; };
...@@ -104,9 +104,9 @@ static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */ ...@@ -104,9 +104,9 @@ static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */
0xce, 0x75, 0xf8, 0x7b, 0x8d, 0x46, 0xd1, 0x11, 0x8d, 0x82, 0x00, 0x60, 0x97, 0xc9, 0xa2, 0xb2 0xce, 0x75, 0xf8, 0x7b, 0x8d, 0x46, 0xd1, 0x11, 0x8d, 0x82, 0x00, 0x60, 0x97, 0xc9, 0xa2, 0xb2
}; };
#define PRINT_IF_GUID(g,cmp) \ #define PRINT_IF_GUID(g, cmp) \
if (!ff_guidcmp(g, &cmp)) \ if (!ff_guidcmp(g, &cmp)) \
av_dlog(NULL, "(GUID: %s) ", #cmp) av_dlog(NULL, "(GUID: %s) ", # cmp)
static void print_guid(const ff_asf_guid *g) static void print_guid(const ff_asf_guid *g)
{ {
...@@ -137,7 +137,7 @@ static void print_guid(const ff_asf_guid *g) ...@@ -137,7 +137,7 @@ static void print_guid(const ff_asf_guid *g)
else PRINT_IF_GUID(g, ff_asf_language_guid); else PRINT_IF_GUID(g, ff_asf_language_guid);
else else
av_dlog(NULL, "(GUID: unknown) "); av_dlog(NULL, "(GUID: unknown) ");
for(i=0;i<16;i++) for (i = 0; i < 16; i++)
av_dlog(NULL, " 0x%02x,", (*g)[i]); av_dlog(NULL, " 0x%02x,", (*g)[i]);
av_dlog(NULL, "}\n"); av_dlog(NULL, "}\n");
} }
...@@ -155,13 +155,19 @@ static int asf_probe(AVProbeData *pd) ...@@ -155,13 +155,19 @@ static int asf_probe(AVProbeData *pd)
return 0; return 0;
} }
static int get_value(AVIOContext *pb, int type){ static int get_value(AVIOContext *pb, int type)
switch(type){ {
case 2: return avio_rl32(pb); switch (type) {
case 3: return avio_rl32(pb); case 2:
case 4: return avio_rl64(pb); return avio_rl32(pb);
case 5: return avio_rl16(pb); case 3:
default:return INT_MIN; return avio_rl32(pb);
case 4:
return avio_rl64(pb);
case 5:
return avio_rl16(pb);
default:
return INT_MIN;
} }
} }
...@@ -235,11 +241,9 @@ static int asf_read_picture(AVFormatContext *s, int len) ...@@ -235,11 +241,9 @@ static int asf_read_picture(AVFormatContext *s, int len)
goto fail; goto fail;
} }
st->priv_data = ast; st->priv_data = ast;
st->disposition |= AV_DISPOSITION_ATTACHED_PIC; st->disposition |= AV_DISPOSITION_ATTACHED_PIC;
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = id; st->codec->codec_id = id;
st->attached_pic = pkt; st->attached_pic = pkt;
st->attached_pic.stream_index = st->index; st->attached_pic.stream_index = st->index;
st->attached_pic.flags |= AV_PKT_FLAG_KEY; st->attached_pic.flags |= AV_PKT_FLAG_KEY;
...@@ -265,15 +269,15 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len) ...@@ -265,15 +269,15 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len)
char *value; char *value;
int64_t off = avio_tell(s->pb); int64_t off = avio_tell(s->pb);
if ((unsigned)len >= (UINT_MAX - 1)/2) if ((unsigned)len >= (UINT_MAX - 1) / 2)
return; return;
value = av_malloc(2*len+1); value = av_malloc(2 * len + 1);
if (!value) if (!value)
goto finish; goto finish;
if (type == 0) { // UTF16-LE if (type == 0) { // UTF16-LE
avio_get_str16le(s->pb, len, value, 2*len + 1); avio_get_str16le(s->pb, len, value, 2 * len + 1);
} else if (type == -1) { // ASCII } else if (type == -1) { // ASCII
avio_read(s->pb, value, len); avio_read(s->pb, value, len);
value[len]=0; value[len]=0;
...@@ -284,11 +288,13 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len) ...@@ -284,11 +288,13 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len)
asf_read_picture(s, len); asf_read_picture(s, len);
goto finish; goto finish;
} else { } else {
av_log(s, AV_LOG_DEBUG, "Unsupported value type %d in tag %s.\n", type, key); av_log(s, AV_LOG_DEBUG,
"Unsupported value type %d in tag %s.\n", type, key);
goto finish; goto finish;
} }
if (*value) if (*value)
av_dict_set(&s->metadata, key, value, 0); av_dict_set(&s->metadata, key, value, 0);
finish: finish:
av_freep(&value); av_freep(&value);
avio_seek(s->pb, off + len, SEEK_SET); avio_seek(s->pb, off + len, SEEK_SET);
...@@ -310,7 +316,7 @@ static int asf_read_file_properties(AVFormatContext *s, int64_t size) ...@@ -310,7 +316,7 @@ static int asf_read_file_properties(AVFormatContext *s, int64_t size)
asf->hdr.flags = avio_rl32(pb); asf->hdr.flags = avio_rl32(pb);
asf->hdr.min_pktsize = avio_rl32(pb); asf->hdr.min_pktsize = avio_rl32(pb);
asf->hdr.max_pktsize = avio_rl32(pb); asf->hdr.max_pktsize = avio_rl32(pb);
if (asf->hdr.min_pktsize >= (1U<<29)) if (asf->hdr.min_pktsize >= (1U << 29))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
asf->hdr.max_bitrate = avio_rl32(pb); asf->hdr.max_bitrate = avio_rl32(pb);
s->packet_size = asf->hdr.max_pktsize; s->packet_size = asf->hdr.max_pktsize;
...@@ -329,7 +335,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) ...@@ -329,7 +335,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
int type_specific_size, sizeX; int type_specific_size, sizeX;
unsigned int tag1; unsigned int tag1;
int64_t pos1, pos2, start_time; int64_t pos1, pos2, start_time;
int test_for_ext_stream_audio, is_dvr_ms_audio=0; int test_for_ext_stream_audio, is_dvr_ms_audio = 0;
if (s->nb_streams == ASF_MAX_STREAMS) { if (s->nb_streams == ASF_MAX_STREAMS) {
av_log(s, AV_LOG_ERROR, "too many streams\n"); av_log(s, AV_LOG_ERROR, "too many streams\n");
...@@ -350,7 +356,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) ...@@ -350,7 +356,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
asf_st->stream_language_index = 128; // invalid stream index means no language info asf_st->stream_language_index = 128; // invalid stream index means no language info
if(!(asf->hdr.flags & 0x01)) { // if we aren't streaming... if (!(asf->hdr.flags & 0x01)) { // if we aren't streaming...
int64_t fsize = avio_size(pb); int64_t fsize = avio_size(pb);
if (fsize <= 0 || (int64_t)asf->hdr.file_size <= 0 || FFABS(fsize - (int64_t)asf->hdr.file_size) < 10000) if (fsize <= 0 || (int64_t)asf->hdr.file_size <= 0 || FFABS(fsize - (int64_t)asf->hdr.file_size) < 10000)
st->duration = asf->hdr.play_time / st->duration = asf->hdr.play_time /
...@@ -388,7 +394,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) ...@@ -388,7 +394,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
ff_get_guid(pb, &g); ff_get_guid(pb, &g);
if (!ff_guidcmp(&g, &ff_asf_ext_stream_audio_stream)) { if (!ff_guidcmp(&g, &ff_asf_ext_stream_audio_stream)) {
type = AVMEDIA_TYPE_AUDIO; type = AVMEDIA_TYPE_AUDIO;
is_dvr_ms_audio=1; is_dvr_ms_audio = 1;
ff_get_guid(pb, &g); ff_get_guid(pb, &g);
avio_rl32(pb); avio_rl32(pb);
avio_rl32(pb); avio_rl32(pb);
...@@ -406,27 +412,26 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) ...@@ -406,27 +412,26 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
if (is_dvr_ms_audio) { if (is_dvr_ms_audio) {
// codec_id and codec_tag are unreliable in dvr_ms // codec_id and codec_tag are unreliable in dvr_ms
// files. Set them later by probing stream. // files. Set them later by probing stream.
st->request_probe= 1; st->request_probe = 1;
st->codec->codec_tag = 0; st->codec->codec_tag = 0;
} }
if (st->codec->codec_id == AV_CODEC_ID_AAC) { if (st->codec->codec_id == AV_CODEC_ID_AAC)
st->need_parsing = AVSTREAM_PARSE_NONE; st->need_parsing = AVSTREAM_PARSE_NONE;
} else { else
st->need_parsing = AVSTREAM_PARSE_FULL; st->need_parsing = AVSTREAM_PARSE_FULL;
}
/* We have to init the frame size at some point .... */ /* We have to init the frame size at some point .... */
pos2 = avio_tell(pb); pos2 = avio_tell(pb);
if (size >= (pos2 + 8 - pos1 + 24)) { if (size >= (pos2 + 8 - pos1 + 24)) {
asf_st->ds_span = avio_r8(pb); asf_st->ds_span = avio_r8(pb);
asf_st->ds_packet_size = avio_rl16(pb); asf_st->ds_packet_size = avio_rl16(pb);
asf_st->ds_chunk_size = avio_rl16(pb); asf_st->ds_chunk_size = avio_rl16(pb);
avio_rl16(pb); //ds_data_size avio_rl16(pb); // ds_data_size
avio_r8(pb); //ds_silence_data avio_r8(pb); // ds_silence_data
} }
if (asf_st->ds_span > 1) { if (asf_st->ds_span > 1) {
if (!asf_st->ds_chunk_size if (!asf_st->ds_chunk_size ||
|| (asf_st->ds_packet_size/asf_st->ds_chunk_size <= 1) (asf_st->ds_packet_size / asf_st->ds_chunk_size <= 1) ||
|| asf_st->ds_packet_size % asf_st->ds_chunk_size) asf_st->ds_packet_size % asf_st->ds_chunk_size)
asf_st->ds_span = 0; // disable descrambling asf_st->ds_span = 0; // disable descrambling
} }
} else if (type == AVMEDIA_TYPE_VIDEO && } else if (type == AVMEDIA_TYPE_VIDEO &&
...@@ -435,7 +440,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) ...@@ -435,7 +440,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
avio_rl32(pb); avio_rl32(pb);
avio_r8(pb); avio_r8(pb);
avio_rl16(pb); /* size */ avio_rl16(pb); /* size */
sizeX= avio_rl32(pb); /* size */ sizeX = avio_rl32(pb); /* size */
st->codec->width = avio_rl32(pb); st->codec->width = avio_rl32(pb);
st->codec->height = avio_rl32(pb); st->codec->height = avio_rl32(pb);
/* not available for asf */ /* not available for asf */
...@@ -445,7 +450,8 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) ...@@ -445,7 +450,8 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
avio_skip(pb, 20); avio_skip(pb, 20);
if (sizeX > 40) { if (sizeX > 40) {
st->codec->extradata_size = ffio_limit(pb, sizeX - 40); st->codec->extradata_size = ffio_limit(pb, sizeX - 40);
st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); st->codec->extradata = av_mallocz(st->codec->extradata_size +
FF_INPUT_BUFFER_PADDING_SIZE);
avio_read(pb, st->codec->extradata, st->codec->extradata_size); avio_read(pb, st->codec->extradata, st->codec->extradata_size);
} }
...@@ -455,8 +461,8 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) ...@@ -455,8 +461,8 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) { if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) {
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
int i; int i;
for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++) for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE) / 4; i++)
asf_st->palette[i] = av_bswap32(((uint32_t*)st->codec->extradata)[i]); asf_st->palette[i] = av_bswap32(((uint32_t *)st->codec->extradata)[i]);
#else #else
memcpy(asf_st->palette, st->codec->extradata, memcpy(asf_st->palette, st->codec->extradata,
FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)); FFMIN(st->codec->extradata_size, AVPALETTE_SIZE));
...@@ -466,15 +472,17 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) ...@@ -466,15 +472,17 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
st->codec->codec_tag = tag1; st->codec->codec_tag = tag1;
st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1); st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1);
if(tag1 == MKTAG('D', 'V', 'R', ' ')){ if (tag1 == MKTAG('D', 'V', 'R', ' ')) {
st->need_parsing = AVSTREAM_PARSE_FULL; st->need_parsing = AVSTREAM_PARSE_FULL;
// issue658 containse wrong w/h and MS even puts a fake seq header with wrong w/h in extradata while a correct one is in te stream. maximum lameness /* issue658 contains wrong w/h and MS even puts a fake seq header
* with wrong w/h in extradata while a correct one is in the stream.
* maximum lameness */
st->codec->width = st->codec->width =
st->codec->height = 0; st->codec->height = 0;
av_freep(&st->codec->extradata); av_freep(&st->codec->extradata);
st->codec->extradata_size=0; st->codec->extradata_size = 0;
} }
if(st->codec->codec_id == AV_CODEC_ID_H264) if (st->codec->codec_id == AV_CODEC_ID_H264)
st->need_parsing = AVSTREAM_PARSE_FULL_ONCE; st->need_parsing = AVSTREAM_PARSE_FULL_ONCE;
} }
pos2 = avio_tell(pb); pos2 = avio_tell(pb);
...@@ -509,25 +517,25 @@ static int asf_read_ext_stream_properties(AVFormatContext *s, int64_t size) ...@@ -509,25 +517,25 @@ static int asf_read_ext_stream_properties(AVFormatContext *s, int64_t size)
asf->streams[stream_num].stream_language_index = stream_languageid_index; asf->streams[stream_num].stream_language_index = stream_languageid_index;
avio_rl64(pb); // avg frametime in 100ns units avio_rl64(pb); // avg frametime in 100ns units
stream_ct = avio_rl16(pb); //stream-name-count stream_ct = avio_rl16(pb); // stream-name-count
payload_ext_ct = avio_rl16(pb); //payload-extension-system-count payload_ext_ct = avio_rl16(pb); // payload-extension-system-count
if (stream_num < 128) { if (stream_num < 128) {
asf->stream_bitrates[stream_num] = leak_rate; asf->stream_bitrates[stream_num] = leak_rate;
asf->streams[stream_num].payload_ext_ct = 0; asf->streams[stream_num].payload_ext_ct = 0;
} }
for (i=0; i<stream_ct; i++){ for (i = 0; i < stream_ct; i++) {
avio_rl16(pb); avio_rl16(pb);
ext_len = avio_rl16(pb); ext_len = avio_rl16(pb);
avio_skip(pb, ext_len); avio_skip(pb, ext_len);
} }
for (i=0; i<payload_ext_ct; i++){ for (i = 0; i < payload_ext_ct; i++) {
int size; int size;
ff_get_guid(pb, &g); ff_get_guid(pb, &g);
size = avio_rl16(pb); size = avio_rl16(pb);
ext_len=avio_rl32(pb); ext_len = avio_rl32(pb);
avio_skip(pb, ext_len); avio_skip(pb, ext_len);
if (stream_num < 128 && i < FF_ARRAY_ELEMS(asf->streams[stream_num].payload)) { if (stream_num < 128 && i < FF_ARRAY_ELEMS(asf->streams[stream_num].payload)) {
ASFPayload *p = &asf->streams[stream_num].payload[i]; ASFPayload *p = &asf->streams[stream_num].payload[i];
...@@ -551,10 +559,10 @@ static int asf_read_content_desc(AVFormatContext *s, int64_t size) ...@@ -551,10 +559,10 @@ static int asf_read_content_desc(AVFormatContext *s, int64_t size)
len3 = avio_rl16(pb); len3 = avio_rl16(pb);
len4 = avio_rl16(pb); len4 = avio_rl16(pb);
len5 = avio_rl16(pb); len5 = avio_rl16(pb);
get_tag(s, "title" , 0, len1); get_tag(s, "title", 0, len1);
get_tag(s, "author" , 0, len2); get_tag(s, "author", 0, len2);
get_tag(s, "copyright", 0, len3); get_tag(s, "copyright", 0, len3);
get_tag(s, "comment" , 0, len4); get_tag(s, "comment", 0, len4);
avio_skip(pb, len5); avio_skip(pb, len5);
return 0; return 0;
...@@ -567,28 +575,27 @@ static int asf_read_ext_content_desc(AVFormatContext *s, int64_t size) ...@@ -567,28 +575,27 @@ static int asf_read_ext_content_desc(AVFormatContext *s, int64_t size)
int desc_count, i, ret; int desc_count, i, ret;
desc_count = avio_rl16(pb); desc_count = avio_rl16(pb);
for(i=0;i<desc_count;i++) { for (i = 0; i < desc_count; i++) {
int name_len,value_type,value_len; int name_len, value_type, value_len;
char name[1024]; char name[1024];
name_len = avio_rl16(pb); name_len = avio_rl16(pb);
if (name_len%2) // must be even, broken lavf versions wrote len-1 if (name_len % 2) // must be even, broken lavf versions wrote len-1
name_len += 1; name_len += 1;
if ((ret = avio_get_str16le(pb, name_len, name, sizeof(name))) < name_len) if ((ret = avio_get_str16le(pb, name_len, name, sizeof(name))) < name_len)
avio_skip(pb, name_len - ret); avio_skip(pb, name_len - ret);
value_type = avio_rl16(pb); value_type = avio_rl16(pb);
value_len = avio_rl16(pb); value_len = avio_rl16(pb);
if (!value_type && value_len%2) if (!value_type && value_len % 2)
value_len += 1; value_len += 1;
/** /* My sample has that stream set to 0 maybe that mean the container.
* My sample has that stream set to 0 maybe that mean the container. * ASF stream count starts at 1. I am using 0 to the container value
* Asf stream count start at 1. I am using 0 to the container value since it's unused * since it's unused. */
*/ if (!strcmp(name, "AspectRatioX"))
if (!strcmp(name, "AspectRatioX")){ asf->dar[0].num = get_value(s->pb, value_type);
asf->dar[0].num= get_value(s->pb, value_type); else if (!strcmp(name, "AspectRatioY"))
} else if(!strcmp(name, "AspectRatioY")){ asf->dar[0].den = get_value(s->pb, value_type);
asf->dar[0].den= get_value(s->pb, value_type); else
} else
get_tag(s, name, value_type, value_len); get_tag(s, name, value_type, value_len);
} }
...@@ -601,13 +608,15 @@ static int asf_read_language_list(AVFormatContext *s, int64_t size) ...@@ -601,13 +608,15 @@ static int asf_read_language_list(AVFormatContext *s, int64_t size)
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
int j, ret; int j, ret;
int stream_count = avio_rl16(pb); int stream_count = avio_rl16(pb);
for(j = 0; j < stream_count; j++) { for (j = 0; j < stream_count; j++) {
char lang[6]; char lang[6];
unsigned int lang_len = avio_r8(pb); unsigned int lang_len = avio_r8(pb);
if ((ret = avio_get_str16le(pb, lang_len, lang, sizeof(lang))) < lang_len) if ((ret = avio_get_str16le(pb, lang_len, lang,
sizeof(lang))) < lang_len)
avio_skip(pb, lang_len - ret); avio_skip(pb, lang_len - ret);
if (j < 128) if (j < 128)
av_strlcpy(asf->stream_languages[j], lang, sizeof(*asf->stream_languages)); av_strlcpy(asf->stream_languages[j], lang,
sizeof(*asf->stream_languages));
} }
return 0; return 0;
...@@ -621,26 +630,30 @@ static int asf_read_metadata(AVFormatContext *s, int64_t size) ...@@ -621,26 +630,30 @@ static int asf_read_metadata(AVFormatContext *s, int64_t size)
int ret, i; int ret, i;
n = avio_rl16(pb); n = avio_rl16(pb);
for(i=0;i<n;i++) { for (i = 0; i < n; i++) {
char name[1024]; char name[1024];
int av_unused value_type; int av_unused value_type;
avio_rl16(pb); //lang_list_index avio_rl16(pb); // lang_list_index
stream_num= avio_rl16(pb); stream_num = avio_rl16(pb);
name_len= avio_rl16(pb); name_len = avio_rl16(pb);
value_type = avio_rl16(pb); /* value_type */ value_type = avio_rl16(pb); /* value_type */
value_len= avio_rl32(pb); value_len = avio_rl32(pb);
if ((ret = avio_get_str16le(pb, name_len, name, sizeof(name))) < name_len) if ((ret = avio_get_str16le(pb, name_len, name, sizeof(name))) < name_len)
avio_skip(pb, name_len - ret); avio_skip(pb, name_len - ret);
av_dlog(s, "%d %d %d %d %d <%s>\n", av_dlog(s, "%d %d %d %d %d <%s>\n",
i, stream_num, name_len, value_type, value_len, name); i, stream_num, name_len, value_type, value_len, name);
value_num= avio_rl16(pb);//we should use get_value() here but it does not work 2 is le16 here but le32 elsewhere /* We should use get_value() here but it does not work 2 is le16
* here but le32 elsewhere. */
value_num = avio_rl16(pb);
avio_skip(pb, value_len - 2); avio_skip(pb, value_len - 2);
if(stream_num<128){ if (stream_num < 128) {
if (!strcmp(name, "AspectRatioX")) asf->dar[stream_num].num= value_num; if (!strcmp(name, "AspectRatioX"))
else if(!strcmp(name, "AspectRatioY")) asf->dar[stream_num].den= value_num; asf->dar[stream_num].num = value_num;
else if (!strcmp(name, "AspectRatioY"))
asf->dar[stream_num].den = value_num;
} }
} }
...@@ -658,11 +671,10 @@ static int asf_read_marker(AVFormatContext *s, int64_t size) ...@@ -658,11 +671,10 @@ static int asf_read_marker(AVFormatContext *s, int64_t size)
count = avio_rl32(pb); // markers count count = avio_rl32(pb); // markers count
avio_rl16(pb); // reserved 2 bytes avio_rl16(pb); // reserved 2 bytes
name_len = avio_rl16(pb); // name length name_len = avio_rl16(pb); // name length
for(i=0;i<name_len;i++){ for (i = 0; i < name_len; i++)
avio_r8(pb); // skip the name avio_r8(pb); // skip the name
}
for(i=0;i<count;i++){ for (i = 0; i < count; i++) {
int64_t pres_time; int64_t pres_time;
int name_len; int name_len;
...@@ -672,9 +684,11 @@ static int asf_read_marker(AVFormatContext *s, int64_t size) ...@@ -672,9 +684,11 @@ static int asf_read_marker(AVFormatContext *s, int64_t size)
avio_rl32(pb); // send time avio_rl32(pb); // send time
avio_rl32(pb); // flags avio_rl32(pb); // flags
name_len = avio_rl32(pb); // name length name_len = avio_rl32(pb); // name length
if ((ret = avio_get_str16le(pb, name_len * 2, name, sizeof(name))) < name_len) if ((ret = avio_get_str16le(pb, name_len * 2, name,
sizeof(name))) < name_len)
avio_skip(pb, name_len - ret); avio_skip(pb, name_len - ret);
avpriv_new_chapter(s, i, (AVRational){1, 10000000}, pres_time, AV_NOPTS_VALUE, name ); avpriv_new_chapter(s, i, (AVRational) { 1, 10000000 }, pres_time,
AV_NOPTS_VALUE, name);
} }
return 0; return 0;
...@@ -696,19 +710,19 @@ static int asf_read_header(AVFormatContext *s) ...@@ -696,19 +710,19 @@ static int asf_read_header(AVFormatContext *s)
avio_r8(pb); avio_r8(pb);
avio_r8(pb); avio_r8(pb);
memset(&asf->asfid2avid, -1, sizeof(asf->asfid2avid)); memset(&asf->asfid2avid, -1, sizeof(asf->asfid2avid));
for(;;) { for (;;) {
uint64_t gpos= avio_tell(pb); uint64_t gpos = avio_tell(pb);
ff_get_guid(pb, &g); ff_get_guid(pb, &g);
gsize = avio_rl64(pb); gsize = avio_rl64(pb);
print_guid(&g); print_guid(&g);
if (!ff_guidcmp(&g, &ff_asf_data_header)) { if (!ff_guidcmp(&g, &ff_asf_data_header)) {
asf->data_object_offset = avio_tell(pb); asf->data_object_offset = avio_tell(pb);
// if not streaming, gsize is not unlimited (how?), and there is enough space in the file.. /* If not streaming, gsize is not unlimited (how?),
if (!(asf->hdr.flags & 0x01) && gsize >= 100) { * and there is enough space in the file.. */
if (!(asf->hdr.flags & 0x01) && gsize >= 100)
asf->data_object_size = gsize - 24; asf->data_object_size = gsize - 24;
} else { else
asf->data_object_size = (uint64_t)-1; asf->data_object_size = (uint64_t)-1;
}
break; break;
} }
if (gsize < 24) if (gsize < 24)
...@@ -746,7 +760,8 @@ static int asf_read_header(AVFormatContext *s) ...@@ -746,7 +760,8 @@ static int asf_read_header(AVFormatContext *s)
if (!ff_guidcmp(&g, &ff_asf_content_encryption)) { if (!ff_guidcmp(&g, &ff_asf_content_encryption)) {
unsigned int len; unsigned int len;
AVPacket pkt; AVPacket pkt;
av_log(s, AV_LOG_WARNING, "DRM protected stream detected, decoding will likely fail!\n"); av_log(s, AV_LOG_WARNING,
"DRM protected stream detected, decoding will likely fail!\n");
len= avio_rl32(pb); len= avio_rl32(pb);
av_log(s, AV_LOG_DEBUG, "Secret data:\n"); av_log(s, AV_LOG_DEBUG, "Secret data:\n");
av_get_packet(pb, &pkt, len); av_hex_dump_log(s, AV_LOG_DEBUG, pkt.data, pkt.size); av_free_packet(&pkt); av_get_packet(pb, &pkt, len); av_hex_dump_log(s, AV_LOG_DEBUG, pkt.data, pkt.size); av_free_packet(&pkt);
...@@ -757,15 +772,18 @@ static int asf_read_header(AVFormatContext *s) ...@@ -757,15 +772,18 @@ static int asf_read_header(AVFormatContext *s)
len= avio_rl32(pb); len= avio_rl32(pb);
get_tag(s, "ASF_License_URL", -1, len); get_tag(s, "ASF_License_URL", -1, len);
} else if (!ff_guidcmp(&g, &ff_asf_ext_content_encryption)) { } else if (!ff_guidcmp(&g, &ff_asf_ext_content_encryption)) {
av_log(s, AV_LOG_WARNING, "Ext DRM protected stream detected, decoding will likely fail!\n"); av_log(s, AV_LOG_WARNING,
"Ext DRM protected stream detected, decoding will likely fail!\n");
av_dict_set(&s->metadata, "encryption", "ASF Extended Content Encryption", 0); av_dict_set(&s->metadata, "encryption", "ASF Extended Content Encryption", 0);
} else if (!ff_guidcmp(&g, &ff_asf_digital_signature)) { } else if (!ff_guidcmp(&g, &ff_asf_digital_signature)) {
av_log(s, AV_LOG_INFO, "Digital signature detected!\n"); av_log(s, AV_LOG_INFO, "Digital signature detected!\n");
} }
} }
} }
if(avio_tell(pb) != gpos + gsize) if (avio_tell(pb) != gpos + gsize)
av_log(s, AV_LOG_DEBUG, "gpos mismatch our pos=%"PRIu64", end=%"PRId64"\n", avio_tell(pb)-gpos, gsize); av_log(s, AV_LOG_DEBUG,
"gpos mismatch our pos=%"PRIu64", end=%"PRId64"\n",
avio_tell(pb) - gpos, gsize);
avio_seek(pb, gpos + gsize, SEEK_SET); avio_seek(pb, gpos + gsize, SEEK_SET);
} }
ff_get_guid(pb, &g); ff_get_guid(pb, &g);
...@@ -777,18 +795,19 @@ static int asf_read_header(AVFormatContext *s) ...@@ -777,18 +795,19 @@ static int asf_read_header(AVFormatContext *s)
asf->data_offset = avio_tell(pb); asf->data_offset = avio_tell(pb);
asf->packet_size_left = 0; asf->packet_size_left = 0;
for (i = 0; i < 128; i++) {
for(i=0; i<128; i++){ int stream_num = asf->asfid2avid[i];
int stream_num= asf->asfid2avid[i]; if (stream_num >= 0) {
if(stream_num>=0){
AVStream *st = s->streams[stream_num]; AVStream *st = s->streams[stream_num];
if (!st->codec->bit_rate) if (!st->codec->bit_rate)
st->codec->bit_rate = asf->stream_bitrates[i]; st->codec->bit_rate = asf->stream_bitrates[i];
if (asf->dar[i].num > 0 && asf->dar[i].den > 0){ if (asf->dar[i].num > 0 && asf->dar[i].den > 0) {
av_reduce(&st->sample_aspect_ratio.num, av_reduce(&st->sample_aspect_ratio.num,
&st->sample_aspect_ratio.den, &st->sample_aspect_ratio.den,
asf->dar[i].num, asf->dar[i].den, INT_MAX); asf->dar[i].num, asf->dar[i].den, INT_MAX);
} else if ((asf->dar[0].num > 0) && (asf->dar[0].den > 0) && (st->codec->codec_type==AVMEDIA_TYPE_VIDEO)) // Use ASF container value if the stream doesn't AR set. } else if ((asf->dar[0].num > 0) && (asf->dar[0].den > 0) &&
// Use ASF container value if the stream doesn't set AR.
(st->codec->codec_type == AVMEDIA_TYPE_VIDEO))
av_reduce(&st->sample_aspect_ratio.num, av_reduce(&st->sample_aspect_ratio.num,
&st->sample_aspect_ratio.den, &st->sample_aspect_ratio.den,
asf->dar[0].num, asf->dar[0].den, INT_MAX); asf->dar[0].num, asf->dar[0].den, INT_MAX);
...@@ -802,7 +821,8 @@ static int asf_read_header(AVFormatContext *s) ...@@ -802,7 +821,8 @@ static int asf_read_header(AVFormatContext *s)
const char *rfc1766 = asf->stream_languages[asf->streams[i].stream_language_index]; const char *rfc1766 = asf->stream_languages[asf->streams[i].stream_language_index];
if (rfc1766 && strlen(rfc1766) > 1) { if (rfc1766 && strlen(rfc1766) > 1) {
const char primary_tag[3] = { rfc1766[0], rfc1766[1], '\0' }; // ignore country code if any const char primary_tag[3] = { rfc1766[0], rfc1766[1], '\0' }; // ignore country code if any
const char *iso6392 = av_convert_lang_to(primary_tag, AV_LANG_ISO639_2_BIBL); const char *iso6392 = av_convert_lang_to(primary_tag,
AV_LANG_ISO639_2_BIBL);
if (iso6392) if (iso6392)
av_dict_set(&st->metadata, "language", iso6392, 0); av_dict_set(&st->metadata, "language", iso6392, 0);
} }
...@@ -816,12 +836,22 @@ static int asf_read_header(AVFormatContext *s) ...@@ -816,12 +836,22 @@ static int asf_read_header(AVFormatContext *s)
} }
#define DO_2BITS(bits, var, defval) \ #define DO_2BITS(bits, var, defval) \
switch (bits & 3) \ switch (bits & 3) { \
{ \ case 3: \
case 3: var = avio_rl32(pb); rsize += 4; break; \ var = avio_rl32(pb); \
case 2: var = avio_rl16(pb); rsize += 2; break; \ rsize += 4; \
case 1: var = avio_r8(pb); rsize++; break; \ break; \
default: var = defval; break; \ case 2: \
var = avio_rl16(pb); \
rsize += 2; \
break; \
case 1: \
var = avio_r8(pb); \
rsize++; \
break; \
default: \
var = defval; \
break; \
} }
/** /**
...@@ -838,31 +868,31 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb) ...@@ -838,31 +868,31 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb)
int c, d, e, off; int c, d, e, off;
// if we do not know packet size, allow skipping up to 32 kB // if we do not know packet size, allow skipping up to 32 kB
off= 32768; off = 32768;
if (asf->no_resync_search) if (asf->no_resync_search)
off = 3; off = 3;
else if (s->packet_size > 0) else if (s->packet_size > 0)
off= (avio_tell(pb) - s->data_offset) % s->packet_size + 3; off = (avio_tell(pb) - s->data_offset) % s->packet_size + 3;
c=d=e=-1; c = d = e = -1;
while(off-- > 0){ while (off-- > 0) {
c=d; d=e; c = d;
e= avio_r8(pb); d = e;
if(c == 0x82 && !d && !e) e = avio_r8(pb);
if (c == 0x82 && !d && !e)
break; break;
} }
if (c != 0x82) { if (c != 0x82) {
/** /* This code allows handling of -EAGAIN at packet boundaries (i.e.
* This code allows handling of -EAGAIN at packet boundaries (i.e.
* if the packet sync code above triggers -EAGAIN). This does not * if the packet sync code above triggers -EAGAIN). This does not
* imply complete -EAGAIN handling support at random positions in * imply complete -EAGAIN handling support at random positions in
* the stream. * the stream. */
*/
if (pb->error == AVERROR(EAGAIN)) if (pb->error == AVERROR(EAGAIN))
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
if (!url_feof(pb)) if (!url_feof(pb))
av_log(s, AV_LOG_ERROR, "ff asf bad header %x at:%"PRId64"\n", c, avio_tell(pb)); av_log(s, AV_LOG_ERROR,
"ff asf bad header %x at:%"PRId64"\n", c, avio_tell(pb));
} }
if ((c & 0x8f) == 0x82) { if ((c & 0x8f) == 0x82) {
if (d || e) { if (d || e) {
...@@ -870,11 +900,11 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb) ...@@ -870,11 +900,11 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb)
av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n"); av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
c= avio_r8(pb); c = avio_r8(pb);
d= avio_r8(pb); d = avio_r8(pb);
rsize+=3; rsize += 3;
}else if(!url_feof(pb)){ } else if(!url_feof(pb)) {
avio_seek(pb, -1, SEEK_CUR); //FIXME avio_seek(pb, -1, SEEK_CUR); // FIXME
} }
asf->packet_flags = c; asf->packet_flags = c;
...@@ -884,13 +914,16 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb) ...@@ -884,13 +914,16 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb)
DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored
DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length
//the following checks prevent overflows and infinite loops // the following checks prevent overflows and infinite loops
if(!packet_length || packet_length >= (1U<<29)){ if (!packet_length || packet_length >= (1U << 29)) {
av_log(s, AV_LOG_ERROR, "invalid packet_length %d at:%"PRId64"\n", packet_length, avio_tell(pb)); av_log(s, AV_LOG_ERROR,
"invalid packet_length %d at:%"PRId64"\n",
packet_length, avio_tell(pb));
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if(padsize >= packet_length){ if (padsize >= packet_length) {
av_log(s, AV_LOG_ERROR, "invalid padsize %d at:%"PRId64"\n", padsize, avio_tell(pb)); av_log(s, AV_LOG_ERROR,
"invalid padsize %d at:%"PRId64"\n", padsize, avio_tell(pb));
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -899,7 +932,8 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb) ...@@ -899,7 +932,8 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb)
// rsize has at least 11 bytes which have to be present // rsize has at least 11 bytes which have to be present
if (asf->packet_flags & 0x01) { if (asf->packet_flags & 0x01) {
asf->packet_segsizetype = avio_r8(pb); rsize++; asf->packet_segsizetype = avio_r8(pb);
rsize++;
asf->packet_segments = asf->packet_segsizetype & 0x3f; asf->packet_segments = asf->packet_segsizetype & 0x3f;
} else { } else {
asf->packet_segments = 1; asf->packet_segments = 1;
...@@ -916,7 +950,8 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb) ...@@ -916,7 +950,8 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb)
if (packet_length < asf->hdr.min_pktsize) if (packet_length < asf->hdr.min_pktsize)
padsize += asf->hdr.min_pktsize - packet_length; padsize += asf->hdr.min_pktsize - packet_length;
asf->packet_padsize = padsize; asf->packet_padsize = padsize;
av_dlog(s, "packet: size=%d padsize=%d left=%d\n", s->packet_size, asf->packet_padsize, asf->packet_size_left); av_dlog(s, "packet: size=%d padsize=%d left=%d\n",
s->packet_size, asf->packet_padsize, asf->packet_size_left);
return 0; return 0;
} }
...@@ -924,7 +959,8 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb) ...@@ -924,7 +959,8 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb)
* *
* @return <0 if error * @return <0 if error
*/ */
static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb)
{
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
ASFStream *asfst; ASFStream *asfst;
int rsize = 1; int rsize = 1;
...@@ -951,24 +987,24 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ ...@@ -951,24 +987,24 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){
int64_t end = avio_tell(pb) + asf->packet_replic_size; int64_t end = avio_tell(pb) + asf->packet_replic_size;
AVRational aspect; AVRational aspect;
asf->packet_obj_size = avio_rl32(pb); asf->packet_obj_size = avio_rl32(pb);
if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){ if (asf->packet_obj_size >= (1 << 24) || asf->packet_obj_size <= 0) {
av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n"); av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
asf->packet_frag_timestamp = avio_rl32(pb); // timestamp asf->packet_frag_timestamp = avio_rl32(pb); // timestamp
for (i=0; i<asfst->payload_ext_ct; i++) { for (i = 0; i < asfst->payload_ext_ct; i++) {
ASFPayload *p = &asfst->payload[i]; ASFPayload *p = &asfst->payload[i];
int size = p->size; int size = p->size;
int64_t payend; int64_t payend;
if(size == 0xFFFF) if (size == 0xFFFF)
size = avio_rl16(pb); size = avio_rl16(pb);
payend = avio_tell(pb) + size; payend = avio_tell(pb) + size;
if (payend > end) { if (payend > end) {
av_log(s, AV_LOG_ERROR, "too long payload\n"); av_log(s, AV_LOG_ERROR, "too long payload\n");
break; break;
} }
switch(p->type) { switch (p->type) {
case 0x50: case 0x50:
// duration = avio_rl16(pb); // duration = avio_rl16(pb);
break; break;
...@@ -981,10 +1017,10 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ ...@@ -981,10 +1017,10 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){
break; break;
case 0x2A: case 0x2A:
avio_skip(pb, 8); avio_skip(pb, 8);
ts0= avio_rl64(pb); ts0 = avio_rl64(pb);
ts1= avio_rl64(pb); ts1 = avio_rl64(pb);
if(ts0!= -1) asf->packet_frag_timestamp= ts0/10000; if (ts0!= -1) asf->packet_frag_timestamp = ts0/10000;
else asf->packet_frag_timestamp= AV_NOPTS_VALUE; else asf->packet_frag_timestamp = AV_NOPTS_VALUE;
break; break;
case 0x5B: case 0x5B:
case 0xB7: case 0xB7:
...@@ -999,7 +1035,7 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ ...@@ -999,7 +1035,7 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){
avio_seek(pb, end, SEEK_SET); avio_seek(pb, end, SEEK_SET);
rsize += asf->packet_replic_size; // FIXME - check validity rsize += asf->packet_replic_size; // FIXME - check validity
} else if (asf->packet_replic_size==1){ } else if (asf->packet_replic_size == 1) {
// multipacket - frag_offset is beginning timestamp // multipacket - frag_offset is beginning timestamp
asf->packet_time_start = asf->packet_frag_offset; asf->packet_time_start = asf->packet_frag_offset;
asf->packet_frag_offset = 0; asf->packet_frag_offset = 0;
...@@ -1007,8 +1043,9 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ ...@@ -1007,8 +1043,9 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){
asf->packet_time_delta = avio_r8(pb); asf->packet_time_delta = avio_r8(pb);
rsize++; rsize++;
}else if(asf->packet_replic_size!=0){ } else if (asf->packet_replic_size != 0) {
av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n", asf->packet_replic_size); av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n",
asf->packet_replic_size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (asf->packet_flags & 0x01) { if (asf->packet_flags & 0x01) {
...@@ -1016,9 +1053,10 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ ...@@ -1016,9 +1053,10 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){
if (rsize > asf->packet_size_left) { if (rsize > asf->packet_size_left) {
av_log(s, AV_LOG_ERROR, "packet_replic_size is invalid\n"); av_log(s, AV_LOG_ERROR, "packet_replic_size is invalid\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} else if(asf->packet_frag_size > asf->packet_size_left - rsize){ } else if (asf->packet_frag_size > asf->packet_size_left - rsize) {
if (asf->packet_frag_size > asf->packet_size_left - rsize + asf->packet_padsize) { if (asf->packet_frag_size > asf->packet_size_left - rsize + asf->packet_padsize) {
av_log(s, AV_LOG_ERROR, "packet_frag_size is invalid (%d-%d)\n", asf->packet_size_left, rsize); av_log(s, AV_LOG_ERROR, "packet_frag_size is invalid (%d-%d)\n",
asf->packet_size_left, rsize);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} else { } else {
int diff = asf->packet_frag_size - (asf->packet_size_left - rsize); int diff = asf->packet_frag_size - (asf->packet_size_left - rsize);
...@@ -1065,7 +1103,7 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk ...@@ -1065,7 +1103,7 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk
/* fail safe */ /* fail safe */
avio_skip(pb, ret); avio_skip(pb, ret);
asf->packet_pos= avio_tell(pb); asf->packet_pos = avio_tell(pb);
if (asf->data_object_size != (uint64_t)-1 && if (asf->data_object_size != (uint64_t)-1 &&
(asf->packet_pos - asf->data_object_offset >= asf->data_object_size)) (asf->packet_pos - asf->data_object_offset >= asf->data_object_size))
return AVERROR_EOF; /* Do not exceed the size of the data object */ return AVERROR_EOF; /* Do not exceed the size of the data object */
...@@ -1085,7 +1123,8 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk ...@@ -1085,7 +1123,8 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk
avio_skip(pb, asf->packet_frag_size); avio_skip(pb, asf->packet_frag_size);
asf->packet_size_left -= asf->packet_frag_size; asf->packet_size_left -= asf->packet_frag_size;
if (asf->stream_index < 0) if (asf->stream_index < 0)
av_log(s, AV_LOG_ERROR, "ff asf skip %d (unknown stream)\n", asf->packet_frag_size); av_log(s, AV_LOG_ERROR, "ff asf skip %d (unknown stream)\n",
asf->packet_frag_size);
continue; continue;
} }
asf->asf_st = s->streams[asf->stream_index]->priv_data; asf->asf_st = s->streams[asf->stream_index]->priv_data;
...@@ -1116,11 +1155,12 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk ...@@ -1116,11 +1155,12 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk
} }
if (asf_st->pkt.size != asf->packet_obj_size || if (asf_st->pkt.size != asf->packet_obj_size ||
//FIXME is this condition sufficient? // FIXME is this condition sufficient?
asf_st->frag_offset + asf->packet_frag_size > asf_st->pkt.size) { asf_st->frag_offset + asf->packet_frag_size > asf_st->pkt.size) {
if (asf_st->pkt.data) { if (asf_st->pkt.data) {
av_log(s, AV_LOG_INFO, "freeing incomplete packet size %d, " av_log(s, AV_LOG_INFO,
"new %d\n", asf_st->pkt.size, asf->packet_obj_size); "freeing incomplete packet size %d, new %d\n",
asf_st->pkt.size, asf->packet_obj_size);
asf_st->frag_offset = 0; asf_st->frag_offset = 0;
av_free_packet(&asf_st->pkt); av_free_packet(&asf_st->pkt);
} }
...@@ -1163,8 +1203,10 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk ...@@ -1163,8 +1203,10 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk
if (asf->packet_frag_offset >= asf_st->pkt.size || if (asf->packet_frag_offset >= asf_st->pkt.size ||
asf->packet_frag_size > asf_st->pkt.size - asf->packet_frag_offset) { asf->packet_frag_size > asf_st->pkt.size - asf->packet_frag_offset) {
av_log(s, AV_LOG_ERROR, "packet fragment position invalid %u,%u not in %u\n", av_log(s, AV_LOG_ERROR,
asf->packet_frag_offset, asf->packet_frag_size, asf_st->pkt.size); "packet fragment position invalid %u,%u not in %u\n",
asf->packet_frag_offset, asf->packet_frag_size,
asf_st->pkt.size);
continue; continue;
} }
...@@ -1192,11 +1234,12 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk ...@@ -1192,11 +1234,12 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk
asf_st->frag_offset += ret; asf_st->frag_offset += ret;
/* test if whole packet is read */ /* test if whole packet is read */
if (asf_st->frag_offset == asf_st->pkt.size) { if (asf_st->frag_offset == asf_st->pkt.size) {
//workaround for macroshit radio DVR-MS files // workaround for macroshit radio DVR-MS files
if (s->streams[asf->stream_index]->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO && if (s->streams[asf->stream_index]->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO &&
asf_st->pkt.size > 100) { asf_st->pkt.size > 100) {
int i; int i;
for (i = 0; i < asf_st->pkt.size && !asf_st->pkt.data[i]; i++); for (i = 0; i < asf_st->pkt.size && !asf_st->pkt.data[i]; i++)
;
if (i == asf_st->pkt.size) { if (i == asf_st->pkt.size) {
av_log(s, AV_LOG_DEBUG, "discarding ms fart\n"); av_log(s, AV_LOG_DEBUG, "discarding ms fart\n");
asf_st->frag_offset = 0; asf_st->frag_offset = 0;
...@@ -1207,23 +1250,26 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk ...@@ -1207,23 +1250,26 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk
/* return packet */ /* return packet */
if (asf_st->ds_span > 1) { if (asf_st->ds_span > 1) {
if(asf_st->pkt.size != asf_st->ds_packet_size * asf_st->ds_span) { if (asf_st->pkt.size != asf_st->ds_packet_size * asf_st->ds_span) {
av_log(s, AV_LOG_ERROR, "pkt.size != ds_packet_size * " av_log(s, AV_LOG_ERROR,
"ds_span (%d %d %d)\n", asf_st->pkt.size, "pkt.size != ds_packet_size * ds_span (%d %d %d)\n",
asf_st->ds_packet_size, asf_st->ds_span); asf_st->pkt.size, asf_st->ds_packet_size,
asf_st->ds_span);
} else { } else {
/* packet descrambling */ /* packet descrambling */
uint8_t *newdata = av_malloc(asf_st->pkt.size + FF_INPUT_BUFFER_PADDING_SIZE); uint8_t *newdata = av_malloc(asf_st->pkt.size +
FF_INPUT_BUFFER_PADDING_SIZE);
if (newdata) { if (newdata) {
int offset = 0; int offset = 0;
memset(newdata + asf_st->pkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE); memset(newdata + asf_st->pkt.size, 0,
FF_INPUT_BUFFER_PADDING_SIZE);
while (offset < asf_st->pkt.size) { while (offset < asf_st->pkt.size) {
int off = offset / asf_st->ds_chunk_size; int off = offset / asf_st->ds_chunk_size;
int row = off / asf_st->ds_span; int row = off / asf_st->ds_span;
int col = off % asf_st->ds_span; int col = off % asf_st->ds_span;
int idx = row + col * asf_st->ds_packet_size / asf_st->ds_chunk_size; int idx = row + col * asf_st->ds_packet_size / asf_st->ds_chunk_size;
assert(offset + asf_st->ds_chunk_size <= asf_st->pkt.size); assert(offset + asf_st->ds_chunk_size <= asf_st->pkt.size);
assert(idx+1 <= asf_st->pkt.size / asf_st->ds_chunk_size); assert(idx + 1 <= asf_st->pkt.size / asf_st->ds_chunk_size);
memcpy(newdata + offset, memcpy(newdata + offset,
asf_st->pkt.data + idx * asf_st->ds_chunk_size, asf_st->pkt.data + idx * asf_st->ds_chunk_size,
asf_st->ds_chunk_size); asf_st->ds_chunk_size);
...@@ -1257,7 +1303,8 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -1257,7 +1303,8 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt)
if ((ret = ff_asf_parse_packet(s, s->pb, pkt)) <= 0) if ((ret = ff_asf_parse_packet(s, s->pb, pkt)) <= 0)
return ret; return ret;
if ((ret = ff_asf_get_packet(s, s->pb)) < 0) if ((ret = ff_asf_get_packet(s, s->pb)) < 0)
assert(asf->packet_size_left < FRAME_HEADER_SIZE || asf->packet_segments < 1); assert(asf->packet_size_left < FRAME_HEADER_SIZE ||
asf->packet_segments < 1);
asf->packet_time_start = 0; asf->packet_time_start = 0;
} }
} }
...@@ -1290,13 +1337,13 @@ static void asf_reset_header(AVFormatContext *s) ...@@ -1290,13 +1337,13 @@ static void asf_reset_header(AVFormatContext *s)
asf->packet_time_delta = 0; asf->packet_time_delta = 0;
asf->packet_time_start = 0; asf->packet_time_start = 0;
for(i=0; i<s->nb_streams; i++){ for (i = 0; i < s->nb_streams; i++) {
asf_st= s->streams[i]->priv_data; asf_st = s->streams[i]->priv_data;
av_free_packet(&asf_st->pkt); av_free_packet(&asf_st->pkt);
asf_st->frag_offset=0; asf_st->frag_offset = 0;
asf_st->seq=0; asf_st->seq = 0;
} }
asf->asf_st= NULL; asf->asf_st = NULL;
} }
static int asf_read_close(AVFormatContext *s) static int asf_read_close(AVFormatContext *s)
...@@ -1306,28 +1353,30 @@ static int asf_read_close(AVFormatContext *s) ...@@ -1306,28 +1353,30 @@ static int asf_read_close(AVFormatContext *s)
return 0; return 0;
} }
static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos, int64_t pos_limit) static int64_t asf_read_pts(AVFormatContext *s, int stream_index,
int64_t *ppos, int64_t pos_limit)
{ {
AVPacket pkt1, *pkt = &pkt1; AVPacket pkt1, *pkt = &pkt1;
ASFStream *asf_st; ASFStream *asf_st;
int64_t pts; int64_t pts;
int64_t pos= *ppos; int64_t pos = *ppos;
int i; int i;
int64_t start_pos[ASF_MAX_STREAMS]; int64_t start_pos[ASF_MAX_STREAMS];
for(i=0; i<s->nb_streams; i++){ for (i = 0; i < s->nb_streams; i++)
start_pos[i]= pos; start_pos[i] = pos;
}
if (s->packet_size > 0) if (s->packet_size > 0)
pos= (pos+s->packet_size-1-s->data_offset)/s->packet_size*s->packet_size+ s->data_offset; pos = (pos + s->packet_size - 1 - s->data_offset) /
*ppos= pos; s->packet_size * s->packet_size +
s->data_offset;
*ppos = pos;
if (avio_seek(s->pb, pos, SEEK_SET) < 0) if (avio_seek(s->pb, pos, SEEK_SET) < 0)
return AV_NOPTS_VALUE; return AV_NOPTS_VALUE;
asf_reset_header(s); asf_reset_header(s);
for(;;){ for (;;) {
if (av_read_frame(s, pkt) < 0){ if (av_read_frame(s, pkt) < 0) {
av_log(s, AV_LOG_INFO, "asf_read_pts failed\n"); av_log(s, AV_LOG_INFO, "asf_read_pts failed\n");
return AV_NOPTS_VALUE; return AV_NOPTS_VALUE;
} }
...@@ -1335,23 +1384,24 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos, ...@@ -1335,23 +1384,24 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos,
pts = pkt->dts; pts = pkt->dts;
av_free_packet(pkt); av_free_packet(pkt);
if(pkt->flags&AV_PKT_FLAG_KEY){ if (pkt->flags & AV_PKT_FLAG_KEY) {
i= pkt->stream_index; i = pkt->stream_index;
asf_st= s->streams[i]->priv_data; asf_st = s->streams[i]->priv_data;
// assert((asf_st->packet_pos - s->data_offset) % s->packet_size == 0); // assert((asf_st->packet_pos - s->data_offset) % s->packet_size == 0);
pos= asf_st->packet_pos; pos = asf_st->packet_pos;
av_add_index_entry(s->streams[i], pos, pts, pkt->size, pos - start_pos[i] + 1, AVINDEX_KEYFRAME); av_add_index_entry(s->streams[i], pos, pts, pkt->size,
start_pos[i]= asf_st->packet_pos + 1; pos - start_pos[i] + 1, AVINDEX_KEYFRAME);
start_pos[i] = asf_st->packet_pos + 1;
if(pkt->stream_index == stream_index) if (pkt->stream_index == stream_index)
break; break;
} }
} }
*ppos= pos; *ppos = pos;
return pts; return pts;
} }
...@@ -1359,7 +1409,7 @@ static void asf_build_simple_index(AVFormatContext *s, int stream_index) ...@@ -1359,7 +1409,7 @@ static void asf_build_simple_index(AVFormatContext *s, int stream_index)
{ {
ff_asf_guid g; ff_asf_guid g;
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
int64_t current_pos= avio_tell(s->pb); int64_t current_pos = avio_tell(s->pb);
if(avio_seek(s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET) < 0) { if(avio_seek(s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET) < 0) {
asf->index_read= -1; asf->index_read= -1;
...@@ -1369,47 +1419,51 @@ static void asf_build_simple_index(AVFormatContext *s, int stream_index) ...@@ -1369,47 +1419,51 @@ static void asf_build_simple_index(AVFormatContext *s, int stream_index)
ff_get_guid(s->pb, &g); ff_get_guid(s->pb, &g);
/* the data object can be followed by other top-level objects, /* the data object can be followed by other top-level objects,
skip them until the simple index object is reached */ * skip them until the simple index object is reached */
while (ff_guidcmp(&g, &ff_asf_simple_index_header)) { while (ff_guidcmp(&g, &ff_asf_simple_index_header)) {
int64_t gsize= avio_rl64(s->pb); int64_t gsize = avio_rl64(s->pb);
if (gsize < 24 || url_feof(s->pb)) { if (gsize < 24 || url_feof(s->pb)) {
avio_seek(s->pb, current_pos, SEEK_SET); avio_seek(s->pb, current_pos, SEEK_SET);
asf->index_read= -1; asf->index_read= -1;
return; return;
} }
avio_skip(s->pb, gsize-24); avio_skip(s->pb, gsize - 24);
ff_get_guid(s->pb, &g); ff_get_guid(s->pb, &g);
} }
{ {
int64_t itime, last_pos=-1; int64_t itime, last_pos = -1;
int pct, ict; int pct, ict;
int i; int i;
int64_t av_unused gsize= avio_rl64(s->pb); int64_t av_unused gsize = avio_rl64(s->pb);
ff_get_guid(s->pb, &g); ff_get_guid(s->pb, &g);
itime=avio_rl64(s->pb); itime = avio_rl64(s->pb);
pct=avio_rl32(s->pb); pct = avio_rl32(s->pb);
ict=avio_rl32(s->pb); ict = avio_rl32(s->pb);
av_log(s, AV_LOG_DEBUG, "itime:0x%"PRIx64", pct:%d, ict:%d\n",itime,pct,ict); av_log(s, AV_LOG_DEBUG,
"itime:0x%"PRIx64", pct:%d, ict:%d\n", itime, pct, ict);
for (i=0;i<ict;i++){ for (i = 0; i < ict; i++) {
int pktnum=avio_rl32(s->pb); int pktnum = avio_rl32(s->pb);
int pktct =avio_rl16(s->pb); int pktct = avio_rl16(s->pb);
int64_t pos = s->data_offset + s->packet_size*(int64_t)pktnum; int64_t pos = s->data_offset + s->packet_size * (int64_t)pktnum;
int64_t index_pts= FFMAX(av_rescale(itime, i, 10000) - asf->hdr.preroll, 0); int64_t index_pts = FFMAX(av_rescale(itime, i, 10000) - asf->hdr.preroll, 0);
if(pos != last_pos){ if (pos != last_pos) {
av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d pts: %"PRId64"\n", pktnum, pktct, index_pts); av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d pts: %"PRId64"\n",
av_add_index_entry(s->streams[stream_index], pos, index_pts, s->packet_size, 0, AVINDEX_KEYFRAME); pktnum, pktct, index_pts);
last_pos=pos; av_add_index_entry(s->streams[stream_index], pos, index_pts,
s->packet_size, 0, AVINDEX_KEYFRAME);
last_pos = pos;
} }
} }
asf->index_read= ict > 1; asf->index_read = ict > 1;
} }
avio_seek(s->pb, current_pos, SEEK_SET); avio_seek(s->pb, current_pos, SEEK_SET);
} }
static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags) static int asf_read_seek(AVFormatContext *s, int stream_index,
int64_t pts, int flags)
{ {
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
AVStream *st = s->streams[stream_index]; AVStream *st = s->streams[stream_index];
...@@ -1418,9 +1472,9 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int ...@@ -1418,9 +1472,9 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
return -1; return -1;
/* Try using the protocol's read_seek if available */ /* Try using the protocol's read_seek if available */
if(s->pb) { if (s->pb) {
int ret = avio_seek_time(s->pb, stream_index, pts, flags); int ret = avio_seek_time(s->pb, stream_index, pts, flags);
if(ret >= 0) if (ret >= 0)
asf_reset_header(s); asf_reset_header(s);
if (ret != AVERROR(ENOSYS)) if (ret != AVERROR(ENOSYS))
return ret; return ret;
...@@ -1429,9 +1483,9 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int ...@@ -1429,9 +1483,9 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
if (!asf->index_read) if (!asf->index_read)
asf_build_simple_index(s, stream_index); asf_build_simple_index(s, stream_index);
if((asf->index_read > 0 && st->index_entries)){ if ((asf->index_read > 0 && st->index_entries)) {
int index= av_index_search_timestamp(st, pts, flags); int index = av_index_search_timestamp(st, pts, flags);
if(index >= 0) { if (index >= 0) {
/* find the position */ /* find the position */
uint64_t pos = st->index_entries[index].pos; uint64_t pos = st->index_entries[index].pos;
......
libavformat/asfenc.c
View file @ fadf8459
...@@ -18,12 +18,13 @@ ...@@ -18,12 +18,13 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/dict.h"
#include "avformat.h" #include "avformat.h"
#include "avio_internal.h"
#include "internal.h" #include "internal.h"
#include "riff.h" #include "riff.h"
#include "asf.h" #include "asf.h"
#include "avio_internal.h"
#include "libavutil/dict.h"
#undef NDEBUG #undef NDEBUG
#include <assert.h> #include <assert.h>
...@@ -33,10 +34,9 @@ ...@@ -33,10 +34,9 @@
#define ASF_INDEX_BLOCK (1<<9) #define ASF_INDEX_BLOCK (1<<9)
#define ASF_PACKET_ERROR_CORRECTION_DATA_SIZE 0x2 #define ASF_PACKET_ERROR_CORRECTION_DATA_SIZE 0x2
#define ASF_PACKET_ERROR_CORRECTION_FLAGS (\ #define ASF_PACKET_ERROR_CORRECTION_FLAGS \
ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT | \ (ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT | \
ASF_PACKET_ERROR_CORRECTION_DATA_SIZE\ ASF_PACKET_ERROR_CORRECTION_DATA_SIZE)
)
#if (ASF_PACKET_ERROR_CORRECTION_FLAGS != 0) #if (ASF_PACKET_ERROR_CORRECTION_FLAGS != 0)
# define ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE 1 # define ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE 1
...@@ -44,12 +44,11 @@ ...@@ -44,12 +44,11 @@
# define ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE 0 # define ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE 0
#endif #endif
#define ASF_PPI_PROPERTY_FLAGS (\ #define ASF_PPI_PROPERTY_FLAGS \
ASF_PL_FLAG_REPLICATED_DATA_LENGTH_FIELD_IS_BYTE | \ (ASF_PL_FLAG_REPLICATED_DATA_LENGTH_FIELD_IS_BYTE | \
ASF_PL_FLAG_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_IS_DWORD | \ ASF_PL_FLAG_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_IS_DWORD | \
ASF_PL_FLAG_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_IS_BYTE | \ ASF_PL_FLAG_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_IS_BYTE | \
ASF_PL_FLAG_STREAM_NUMBER_LENGTH_FIELD_IS_BYTE \ ASF_PL_FLAG_STREAM_NUMBER_LENGTH_FIELD_IS_BYTE)
)
#define ASF_PPI_LENGTH_TYPE_FLAGS 0 #define ASF_PPI_LENGTH_TYPE_FLAGS 0
...@@ -68,7 +67,6 @@ ...@@ -68,7 +67,6 @@
# define ASF_PPI_SEQUENCE_FIELD_SIZE 0 # define ASF_PPI_SEQUENCE_FIELD_SIZE 0
#endif #endif
#if (ASF_PPI_FLAG_PACKET_LENGTH_FIELD_IS_BYTE == (ASF_PPI_LENGTH_TYPE_FLAGS & ASF_PPI_MASK_PACKET_LENGTH_FIELD_SIZE)) #if (ASF_PPI_FLAG_PACKET_LENGTH_FIELD_IS_BYTE == (ASF_PPI_LENGTH_TYPE_FLAGS & ASF_PPI_MASK_PACKET_LENGTH_FIELD_SIZE))
# define ASF_PPI_PACKET_LENGTH_FIELD_SIZE 1 # define ASF_PPI_PACKET_LENGTH_FIELD_SIZE 1
#endif #endif
...@@ -144,51 +142,45 @@ ...@@ -144,51 +142,45 @@
# define ASF_PAYLOAD_LENGTH_FIELD_SIZE 0 # define ASF_PAYLOAD_LENGTH_FIELD_SIZE 0
#endif #endif
#define PACKET_HEADER_MIN_SIZE (\ #define PACKET_HEADER_MIN_SIZE \
ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE + \ (ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE + \
ASF_PACKET_ERROR_CORRECTION_DATA_SIZE + \ ASF_PACKET_ERROR_CORRECTION_DATA_SIZE + \
1 + /*Length Type Flags*/ \ 1 + /* Length Type Flags */ \
1 + /*Property Flags*/ \ 1 + /* Property Flags */ \
ASF_PPI_PACKET_LENGTH_FIELD_SIZE + \ ASF_PPI_PACKET_LENGTH_FIELD_SIZE + \
ASF_PPI_SEQUENCE_FIELD_SIZE + \ ASF_PPI_SEQUENCE_FIELD_SIZE + \
ASF_PPI_PADDING_LENGTH_FIELD_SIZE + \ ASF_PPI_PADDING_LENGTH_FIELD_SIZE + \
4 + /*Send Time Field*/ \ 4 + /* Send Time Field */ \
2 /*Duration Field*/ \ 2) /* Duration Field */
)
// Replicated Data shall be at least 8 bytes long. // Replicated Data shall be at least 8 bytes long.
#define ASF_PAYLOAD_REPLICATED_DATA_LENGTH 0x08 #define ASF_PAYLOAD_REPLICATED_DATA_LENGTH 0x08
#define PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD (\ #define PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD \
1 + /*Stream Number*/ \ (1 + /* Stream Number */ \
ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \ ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \
ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \ ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \
ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \ ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \
ASF_PAYLOAD_REPLICATED_DATA_LENGTH \ ASF_PAYLOAD_REPLICATED_DATA_LENGTH)
)
#define PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS (\ #define PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS \
1 + /*Stream Number*/ \ (1 + /* Stream Number */ \
ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \ ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \
ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \ ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \
ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \ ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \
ASF_PAYLOAD_REPLICATED_DATA_LENGTH + \ ASF_PAYLOAD_REPLICATED_DATA_LENGTH + \
ASF_PAYLOAD_LENGTH_FIELD_SIZE \ ASF_PAYLOAD_LENGTH_FIELD_SIZE)
)
#define SINGLE_PAYLOAD_DATA_LENGTH (\ #define SINGLE_PAYLOAD_DATA_LENGTH \
PACKET_SIZE - \ (PACKET_SIZE - \
PACKET_HEADER_MIN_SIZE - \ PACKET_HEADER_MIN_SIZE - \
PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD \ PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD)
)
#define MULTI_PAYLOAD_CONSTANT (\ #define MULTI_PAYLOAD_CONSTANT \
PACKET_SIZE - \ (PACKET_SIZE - \
PACKET_HEADER_MIN_SIZE - \ PACKET_HEADER_MIN_SIZE - \
1 - /*Payload Flags*/ \ 1 - /* Payload Flags */ \
2*PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS \ 2 * PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS)
)
typedef struct { typedef struct {
uint32_t seqno; uint32_t seqno;
...@@ -208,7 +200,7 @@ typedef struct { ...@@ -208,7 +200,7 @@ typedef struct {
/* only for reading */ /* only for reading */
uint64_t data_offset; ///< beginning of the first data packet uint64_t data_offset; ///< beginning of the first data packet
ASFIndex* index_ptr; ASFIndex *index_ptr;
uint32_t nb_index_memory_alloc; uint32_t nb_index_memory_alloc;
uint16_t maximum_packet; uint16_t maximum_packet;
uint32_t next_packet_number; uint32_t next_packet_number;
...@@ -269,7 +261,8 @@ static void end_header(AVIOContext *pb, int64_t pos) ...@@ -269,7 +261,8 @@ static void end_header(AVIOContext *pb, int64_t pos)
} }
/* write an asf chunk (only used in streaming case) */ /* write an asf chunk (only used in streaming case) */
static void put_chunk(AVFormatContext *s, int type, int payload_length, int flags) static void put_chunk(AVFormatContext *s, int type,
int payload_length, int flags)
{ {
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
...@@ -277,10 +270,10 @@ static void put_chunk(AVFormatContext *s, int type, int payload_length, int flag ...@@ -277,10 +270,10 @@ static void put_chunk(AVFormatContext *s, int type, int payload_length, int flag
length = payload_length + 8; length = payload_length + 8;
avio_wl16(pb, type); avio_wl16(pb, type);
avio_wl16(pb, length); //size avio_wl16(pb, length); // size
avio_wl32(pb, asf->seqno);//sequence number avio_wl32(pb, asf->seqno); // sequence number
avio_wl16(pb, flags); /* unknown bytes */ avio_wl16(pb, flags); // unknown bytes
avio_wl16(pb, length); //size_confirm avio_wl16(pb, length); // size_confirm
asf->seqno++; asf->seqno++;
} }
...@@ -295,7 +288,8 @@ static int64_t unix_to_file_time(int ti) ...@@ -295,7 +288,8 @@ static int64_t unix_to_file_time(int ti)
} }
/* write the header (used two times if non streamed) */ /* write the header (used two times if non streamed) */
static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data_chunk_size) static int asf_write_header1(AVFormatContext *s, int64_t file_size,
int64_t data_chunk_size)
{ {
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
...@@ -310,18 +304,18 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data ...@@ -310,18 +304,18 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
ff_metadata_conv(&s->metadata, ff_asf_metadata_conv, NULL); ff_metadata_conv(&s->metadata, ff_asf_metadata_conv, NULL);
tags[0] = av_dict_get(s->metadata, "title" , NULL, 0); tags[0] = av_dict_get(s->metadata, "title", NULL, 0);
tags[1] = av_dict_get(s->metadata, "author" , NULL, 0); tags[1] = av_dict_get(s->metadata, "author", NULL, 0);
tags[2] = av_dict_get(s->metadata, "copyright", NULL, 0); tags[2] = av_dict_get(s->metadata, "copyright", NULL, 0);
tags[3] = av_dict_get(s->metadata, "comment" , NULL, 0); tags[3] = av_dict_get(s->metadata, "comment", NULL, 0);
tags[4] = av_dict_get(s->metadata, "rating" , NULL, 0); tags[4] = av_dict_get(s->metadata, "rating", NULL, 0);
duration = asf->duration + PREROLL_TIME * 10000; duration = asf->duration + PREROLL_TIME * 10000;
has_title = tags[0] || tags[1] || tags[2] || tags[3] || tags[4]; has_title = tags[0] || tags[1] || tags[2] || tags[3] || tags[4];
metadata_count = av_dict_count(s->metadata); metadata_count = av_dict_count(s->metadata);
bit_rate = 0; bit_rate = 0;
for(n=0;n<s->nb_streams;n++) { for (n = 0; n < s->nb_streams; n++) {
enc = s->streams[n]->codec; enc = s->streams[n]->codec;
avpriv_set_pts_info(s->streams[n], 32, 1, 1000); /* 32 bit pts in ms */ avpriv_set_pts_info(s->streams[n], 32, 1, 1000); /* 32 bit pts in ms */
...@@ -350,7 +344,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data ...@@ -350,7 +344,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
avio_wl64(pb, duration); /* end time stamp (in 100ns units) */ avio_wl64(pb, duration); /* end time stamp (in 100ns units) */
avio_wl64(pb, asf->duration); /* duration (in 100ns units) */ avio_wl64(pb, asf->duration); /* duration (in 100ns units) */
avio_wl64(pb, PREROLL_TIME); /* start time stamp */ avio_wl64(pb, PREROLL_TIME); /* start time stamp */
avio_wl32(pb, (asf->is_streamed || !pb->seekable ) ? 3 : 2); /* ??? */ avio_wl32(pb, (asf->is_streamed || !pb->seekable) ? 3 : 2); /* ??? */
avio_wl32(pb, s->packet_size); /* packet size */ avio_wl32(pb, s->packet_size); /* packet size */
avio_wl32(pb, s->packet_size); /* packet size */ avio_wl32(pb, s->packet_size); /* packet size */
avio_wl32(pb, bit_rate); /* Nominal data rate in bps */ avio_wl32(pb, bit_rate); /* Nominal data rate in bps */
...@@ -396,7 +390,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data ...@@ -396,7 +390,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
} }
/* stream headers */ /* stream headers */
for(n=0;n<s->nb_streams;n++) { for (n = 0; n < s->nb_streams; n++) {
int64_t es_pos; int64_t es_pos;
// ASFStream *stream = &asf->streams[n]; // ASFStream *stream = &asf->streams[n];
...@@ -404,8 +398,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data ...@@ -404,8 +398,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
asf->streams[n].num = n + 1; asf->streams[n].num = n + 1;
asf->streams[n].seq = 1; asf->streams[n].seq = 1;
switch (enc->codec_type) {
switch(enc->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
wav_extra_size = 0; wav_extra_size = 0;
extra_size = 18 + wav_extra_size; extra_size = 18 + wav_extra_size;
...@@ -448,10 +441,10 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data ...@@ -448,10 +441,10 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
} }
/* ERROR Correction */ /* ERROR Correction */
avio_w8(pb, 0x01); avio_w8(pb, 0x01);
if(enc->codec_id == AV_CODEC_ID_ADPCM_G726 || !enc->block_align){ if (enc->codec_id == AV_CODEC_ID_ADPCM_G726 || !enc->block_align) {
avio_wl16(pb, 0x0190); avio_wl16(pb, 0x0190);
avio_wl16(pb, 0x0190); avio_wl16(pb, 0x0190);
}else{ } else {
avio_wl16(pb, enc->block_align); avio_wl16(pb, enc->block_align);
avio_wl16(pb, enc->block_align); avio_wl16(pb, enc->block_align);
} }
...@@ -474,7 +467,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data ...@@ -474,7 +467,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
hpos = put_header(pb, &ff_asf_codec_comment_header); hpos = put_header(pb, &ff_asf_codec_comment_header);
ff_put_guid(pb, &ff_asf_codec_comment1_header); ff_put_guid(pb, &ff_asf_codec_comment1_header);
avio_wl32(pb, s->nb_streams); avio_wl32(pb, s->nb_streams);
for(n=0;n<s->nb_streams;n++) { for (n = 0; n < s->nb_streams; n++) {
AVCodec *p; AVCodec *p;
const char *desc; const char *desc;
int len; int len;
...@@ -484,19 +477,19 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data ...@@ -484,19 +477,19 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
enc = s->streams[n]->codec; enc = s->streams[n]->codec;
p = avcodec_find_encoder(enc->codec_id); p = avcodec_find_encoder(enc->codec_id);
if(enc->codec_type == AVMEDIA_TYPE_AUDIO) if (enc->codec_type == AVMEDIA_TYPE_AUDIO)
avio_wl16(pb, 2); avio_wl16(pb, 2);
else if(enc->codec_type == AVMEDIA_TYPE_VIDEO) else if (enc->codec_type == AVMEDIA_TYPE_VIDEO)
avio_wl16(pb, 1); avio_wl16(pb, 1);
else else
avio_wl16(pb, -1); avio_wl16(pb, -1);
if(enc->codec_id == AV_CODEC_ID_WMAV2) if (enc->codec_id == AV_CODEC_ID_WMAV2)
desc = "Windows Media Audio V8"; desc = "Windows Media Audio V8";
else else
desc = p ? p->name : enc->codec_name; desc = p ? p->name : enc->codec_name;
if ( avio_open_dyn_buf(&dyn_buf) < 0) if (avio_open_dyn_buf(&dyn_buf) < 0)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
avio_put_str16le(dyn_buf, desc); avio_put_str16le(dyn_buf, desc);
...@@ -508,7 +501,6 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data ...@@ -508,7 +501,6 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
avio_wl16(pb, 0); /* no parameters */ avio_wl16(pb, 0); /* no parameters */
/* id */ /* id */
if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
avio_wl16(pb, 2); avio_wl16(pb, 2);
...@@ -517,7 +509,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data ...@@ -517,7 +509,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
avio_wl16(pb, 4); avio_wl16(pb, 4);
avio_wl32(pb, enc->codec_tag); avio_wl32(pb, enc->codec_tag);
} }
if(!enc->codec_tag) if (!enc->codec_tag)
return -1; return -1;
} }
end_header(pb, hpos); end_header(pb, hpos);
...@@ -559,7 +551,7 @@ static int asf_write_header(AVFormatContext *s) ...@@ -559,7 +551,7 @@ static int asf_write_header(AVFormatContext *s)
s->packet_size = PACKET_SIZE; s->packet_size = PACKET_SIZE;
asf->nb_packets = 0; asf->nb_packets = 0;
asf->index_ptr = av_malloc( sizeof(ASFIndex) * ASF_INDEX_BLOCK ); asf->index_ptr = av_malloc(sizeof(ASFIndex) * ASF_INDEX_BLOCK);
asf->nb_index_memory_alloc = ASF_INDEX_BLOCK; asf->nb_index_memory_alloc = ASF_INDEX_BLOCK;
asf->maximum_packet = 0; asf->maximum_packet = 0;
...@@ -594,30 +586,25 @@ static int asf_write_stream_header(AVFormatContext *s) ...@@ -594,30 +586,25 @@ static int asf_write_stream_header(AVFormatContext *s)
return asf_write_header(s); return asf_write_header(s);
} }
static int put_payload_parsing_info( static int put_payload_parsing_info(AVFormatContext *s,
AVFormatContext *s, unsigned sendtime, unsigned duration,
unsigned int sendtime, int nb_payloads, int padsize)
unsigned int duration,
int nb_payloads,
int padsize
)
{ {
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int ppi_size, i; int ppi_size, i;
int64_t start= avio_tell(pb); int64_t start = avio_tell(pb);
int iLengthTypeFlags = ASF_PPI_LENGTH_TYPE_FLAGS; int iLengthTypeFlags = ASF_PPI_LENGTH_TYPE_FLAGS;
padsize -= PACKET_HEADER_MIN_SIZE; padsize -= PACKET_HEADER_MIN_SIZE;
if(asf->multi_payloads_present) if (asf->multi_payloads_present)
padsize--; padsize--;
assert(padsize>=0); assert(padsize >= 0);
avio_w8(pb, ASF_PACKET_ERROR_CORRECTION_FLAGS); avio_w8(pb, ASF_PACKET_ERROR_CORRECTION_FLAGS);
for (i = 0; i < ASF_PACKET_ERROR_CORRECTION_DATA_SIZE; i++){ for (i = 0; i < ASF_PACKET_ERROR_CORRECTION_DATA_SIZE; i++)
avio_w8(pb, 0x0); avio_w8(pb, 0x0);
}
if (asf->multi_payloads_present) if (asf->multi_payloads_present)
iLengthTypeFlags |= ASF_PPI_FLAG_MULTIPLE_PAYLOADS_PRESENT; iLengthTypeFlags |= ASF_PPI_FLAG_MULTIPLE_PAYLOADS_PRESENT;
...@@ -654,17 +641,14 @@ static void flush_packet(AVFormatContext *s) ...@@ -654,17 +641,14 @@ static void flush_packet(AVFormatContext *s)
assert(asf->packet_timestamp_end >= asf->packet_timestamp_start); assert(asf->packet_timestamp_end >= asf->packet_timestamp_start);
if (asf->is_streamed) { if (asf->is_streamed)
put_chunk(s, 0x4424, s->packet_size, 0); put_chunk(s, 0x4424, s->packet_size, 0);
}
packet_hdr_size = put_payload_parsing_info( packet_hdr_size = put_payload_parsing_info(s,
s,
asf->packet_timestamp_start, asf->packet_timestamp_start,
asf->packet_timestamp_end - asf->packet_timestamp_start, asf->packet_timestamp_end - asf->packet_timestamp_start,
asf->packet_nb_payloads, asf->packet_nb_payloads,
asf->packet_size_left asf->packet_size_left);
);
packet_filled_size = PACKET_SIZE - asf->packet_size_left; packet_filled_size = PACKET_SIZE - asf->packet_size_left;
assert(packet_hdr_size <= asf->packet_size_left); assert(packet_hdr_size <= asf->packet_size_left);
...@@ -681,15 +665,9 @@ static void flush_packet(AVFormatContext *s) ...@@ -681,15 +665,9 @@ static void flush_packet(AVFormatContext *s)
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);
} }
static void put_payload_header( static void put_payload_header(AVFormatContext *s, ASFStream *stream,
AVFormatContext *s, int64_t presentation_time, int m_obj_size,
ASFStream *stream, int m_obj_offset, int payload_len, int flags)
int64_t presentation_time,
int m_obj_size,
int m_obj_offset,
int payload_len,
int flags
)
{ {
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
AVIOContext *pb = &asf->pb; AVIOContext *pb = &asf->pb;
...@@ -700,8 +678,8 @@ static void put_payload_header( ...@@ -700,8 +678,8 @@ static void put_payload_header(
val |= ASF_PL_FLAG_KEY_FRAME; val |= ASF_PL_FLAG_KEY_FRAME;
avio_w8(pb, val); avio_w8(pb, val);
avio_w8(pb, stream->seq); //Media object number avio_w8(pb, stream->seq); // Media object number
avio_wl32(pb, m_obj_offset); //Offset Into Media Object avio_wl32(pb, m_obj_offset); // Offset Into Media Object
// Replicated Data shall be at least 8 bytes long. // Replicated Data shall be at least 8 bytes long.
// The first 4 bytes of data shall contain the // The first 4 bytes of data shall contain the
...@@ -710,23 +688,17 @@ static void put_payload_header( ...@@ -710,23 +688,17 @@ static void put_payload_header(
// Presentation Time for the media object that the payload belongs to. // Presentation Time for the media object that the payload belongs to.
avio_w8(pb, ASF_PAYLOAD_REPLICATED_DATA_LENGTH); avio_w8(pb, ASF_PAYLOAD_REPLICATED_DATA_LENGTH);
avio_wl32(pb, m_obj_size); //Replicated Data - Media Object Size avio_wl32(pb, m_obj_size); // Replicated Data - Media Object Size
avio_wl32(pb, (uint32_t) presentation_time);//Replicated Data - Presentation Time avio_wl32(pb, (uint32_t) presentation_time); // Replicated Data - Presentation Time
if (asf->multi_payloads_present){ if (asf->multi_payloads_present) {
avio_wl16(pb, payload_len); //payload length avio_wl16(pb, payload_len); // payload length
} }
} }
static void put_frame( static void put_frame(AVFormatContext *s, ASFStream *stream, AVStream *avst,
AVFormatContext *s, int64_t timestamp, const uint8_t *buf,
ASFStream *stream, int m_obj_size, int flags)
AVStream *avst,
int64_t timestamp,
const uint8_t *buf,
int m_obj_size,
int flags
)
{ {
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
int m_obj_offset, payload_len, frag_len1; int m_obj_offset, payload_len, frag_len1;
...@@ -738,19 +710,20 @@ static void put_frame( ...@@ -738,19 +710,20 @@ static void put_frame(
asf->multi_payloads_present = (payload_len < MULTI_PAYLOAD_CONSTANT); asf->multi_payloads_present = (payload_len < MULTI_PAYLOAD_CONSTANT);
asf->packet_size_left = PACKET_SIZE; asf->packet_size_left = PACKET_SIZE;
if (asf->multi_payloads_present){ if (asf->multi_payloads_present) {
frag_len1 = MULTI_PAYLOAD_CONSTANT - 1; frag_len1 = MULTI_PAYLOAD_CONSTANT - 1;
} } else {
else {
frag_len1 = SINGLE_PAYLOAD_DATA_LENGTH; frag_len1 = SINGLE_PAYLOAD_DATA_LENGTH;
} }
asf->packet_timestamp_start = timestamp; asf->packet_timestamp_start = timestamp;
} } else {
else {
// multi payloads // multi payloads
frag_len1 = asf->packet_size_left - PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS - PACKET_HEADER_MIN_SIZE - 1; frag_len1 = asf->packet_size_left -
PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS -
PACKET_HEADER_MIN_SIZE - 1;
if(frag_len1 < payload_len && avst->codec->codec_type == AVMEDIA_TYPE_AUDIO){ if (frag_len1 < payload_len &&
avst->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
flush_packet(s); flush_packet(s);
continue; continue;
} }
...@@ -759,9 +732,10 @@ static void put_frame( ...@@ -759,9 +732,10 @@ static void put_frame(
if (payload_len > frag_len1) if (payload_len > frag_len1)
payload_len = frag_len1; payload_len = frag_len1;
else if (payload_len == (frag_len1 - 1)) else if (payload_len == (frag_len1 - 1))
payload_len = frag_len1 - 2; //additional byte need to put padding length payload_len = frag_len1 - 2; // additional byte need to put padding length
put_payload_header(s, stream, timestamp+PREROLL_TIME, m_obj_size, m_obj_offset, payload_len, flags); put_payload_header(s, stream, timestamp + PREROLL_TIME,
m_obj_size, m_obj_offset, payload_len, flags);
avio_write(&asf->pb, buf, payload_len); avio_write(&asf->pb, buf, payload_len);
if (asf->multi_payloads_present) if (asf->multi_payloads_present)
...@@ -821,21 +795,22 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -821,21 +795,22 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt)
uint32_t packet_number; uint32_t packet_number;
int64_t pts; int64_t pts;
int start_sec; int start_sec;
int flags= pkt->flags; int flags = pkt->flags;
codec = s->streams[pkt->stream_index]->codec; codec = s->streams[pkt->stream_index]->codec;
stream = &asf->streams[pkt->stream_index]; stream = &asf->streams[pkt->stream_index];
if(codec->codec_type == AVMEDIA_TYPE_AUDIO) if (codec->codec_type == AVMEDIA_TYPE_AUDIO)
flags &= ~AV_PKT_FLAG_KEY; flags &= ~AV_PKT_FLAG_KEY;
pts = (pkt->pts != AV_NOPTS_VALUE) ? pkt->pts : pkt->dts; pts = (pkt->pts != AV_NOPTS_VALUE) ? pkt->pts : pkt->dts;
assert(pts != AV_NOPTS_VALUE); assert(pts != AV_NOPTS_VALUE);
pts *= 10000; pts *= 10000;
asf->duration= FFMAX(asf->duration, pts + pkt->duration * 10000); asf->duration = FFMAX(asf->duration, pts + pkt->duration * 10000);
packet_number = asf->nb_packets; packet_number = asf->nb_packets;
put_frame(s, stream, s->streams[pkt->stream_index], pkt->dts, pkt->data, pkt->size, flags); put_frame(s, stream, s->streams[pkt->stream_index],
pkt->dts, pkt->data, pkt->size, flags);
start_sec = (int)((PREROLL_TIME * 10000 + pts + ASF_INDEXED_INTERVAL - 1) start_sec = (int)((PREROLL_TIME * 10000 + pts + ASF_INDEXED_INTERVAL - 1)
/ ASF_INDEXED_INTERVAL); / ASF_INDEXED_INTERVAL);
...@@ -850,19 +825,19 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -850,19 +825,19 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }
// static int asf_write_index(AVFormatContext *s, ASFIndex *index,
static int asf_write_index(AVFormatContext *s, ASFIndex *index, uint16_t max, uint32_t count) uint16_t max, uint32_t count)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int i; int i;
ff_put_guid(pb, &ff_asf_simple_index_header); ff_put_guid(pb, &ff_asf_simple_index_header);
avio_wl64(pb, 24 + 16 + 8 + 4 + 4 + (4 + 2)*count); avio_wl64(pb, 24 + 16 + 8 + 4 + 4 + (4 + 2) * count);
ff_put_guid(pb, &ff_asf_my_guid); ff_put_guid(pb, &ff_asf_my_guid);
avio_wl64(pb, ASF_INDEXED_INTERVAL); avio_wl64(pb, ASF_INDEXED_INTERVAL);
avio_wl32(pb, max); avio_wl32(pb, max);
avio_wl32(pb, count); avio_wl32(pb, count);
for(i=0; i<count; i++) { for (i = 0; i < count; i++) {
avio_wl32(pb, index[i].packet_number); avio_wl32(pb, index[i].packet_number);
avio_wl16(pb, index[i].packet_count); avio_wl16(pb, index[i].packet_count);
} }
...@@ -873,7 +848,7 @@ static int asf_write_index(AVFormatContext *s, ASFIndex *index, uint16_t max, ui ...@@ -873,7 +848,7 @@ static int asf_write_index(AVFormatContext *s, ASFIndex *index, uint16_t max, ui
static int asf_write_trailer(AVFormatContext *s) static int asf_write_trailer(AVFormatContext *s)
{ {
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
int64_t file_size,data_size; int64_t file_size, data_size;
/* flush the current packet */ /* flush the current packet */
if (asf->pb.buf_ptr > asf->pb.buffer) if (asf->pb.buf_ptr > asf->pb.buffer)
...@@ -913,11 +888,11 @@ AVOutputFormat ff_asf_muxer = { ...@@ -913,11 +888,11 @@ AVOutputFormat ff_asf_muxer = {
.write_packet = asf_write_packet, .write_packet = asf_write_packet,
.write_trailer = asf_write_trailer, .write_trailer = asf_write_trailer,
.flags = AVFMT_GLOBALHEADER, .flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){ .codec_tag = (const AVCodecTag * const []) {
codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0 codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0
}, },
}; };
#endif #endif /* CONFIG_ASF_MUXER */
#if CONFIG_ASF_STREAM_MUXER #if CONFIG_ASF_STREAM_MUXER
AVOutputFormat ff_asf_stream_muxer = { AVOutputFormat ff_asf_stream_muxer = {
...@@ -932,8 +907,8 @@ AVOutputFormat ff_asf_stream_muxer = { ...@@ -932,8 +907,8 @@ AVOutputFormat ff_asf_stream_muxer = {
.write_packet = asf_write_packet, .write_packet = asf_write_packet,
.write_trailer = asf_write_trailer, .write_trailer = asf_write_trailer,
.flags = AVFMT_GLOBALHEADER, .flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){ .codec_tag = (const AVCodecTag * const []) {
codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0 codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0
}, },
}; };
#endif //CONFIG_ASF_STREAM_MUXER #endif /* CONFIG_ASF_STREAM_MUXER */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment