mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b'
* commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b': nuv: cosmetics: pretty-printing Conflicts: libavformat/nuv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
commit
52066bdb30
@ -39,14 +39,15 @@ typedef struct {
|
||||
} NUVContext;
|
||||
|
||||
typedef enum {
|
||||
NUV_VIDEO = 'V',
|
||||
NUV_VIDEO = 'V',
|
||||
NUV_EXTRADATA = 'D',
|
||||
NUV_AUDIO = 'A',
|
||||
NUV_SEEKP = 'R',
|
||||
NUV_MYTHEXT = 'X'
|
||||
NUV_AUDIO = 'A',
|
||||
NUV_SEEKP = 'R',
|
||||
NUV_MYTHEXT = 'X'
|
||||
} nuv_frametype;
|
||||
|
||||
static int nuv_probe(AVProbeData *p) {
|
||||
static int nuv_probe(AVProbeData *p)
|
||||
{
|
||||
if (!memcmp(p->buf, "NuppelVideo", 12))
|
||||
return AVPROBE_SCORE_MAX;
|
||||
if (!memcmp(p->buf, "MythTVVideo", 12))
|
||||
@ -65,83 +66,87 @@ static int nuv_probe(AVProbeData *p) {
|
||||
* @return 1 if all required codec data was found
|
||||
*/
|
||||
static int get_codec_data(AVIOContext *pb, AVStream *vst,
|
||||
AVStream *ast, int myth) {
|
||||
AVStream *ast, int myth)
|
||||
{
|
||||
nuv_frametype frametype;
|
||||
|
||||
if (!vst && !myth)
|
||||
return 1; // no codec data needed
|
||||
while (!url_feof(pb)) {
|
||||
int size, subtype;
|
||||
|
||||
frametype = avio_r8(pb);
|
||||
switch (frametype) {
|
||||
case NUV_EXTRADATA:
|
||||
subtype = avio_r8(pb);
|
||||
avio_skip(pb, 6);
|
||||
size = PKTSIZE(avio_rl32(pb));
|
||||
if (vst && subtype == 'R') {
|
||||
vst->codec->extradata_size = size;
|
||||
vst->codec->extradata = av_malloc(size);
|
||||
avio_read(pb, vst->codec->extradata, size);
|
||||
size = 0;
|
||||
if (!myth)
|
||||
return 1;
|
||||
case NUV_EXTRADATA:
|
||||
subtype = avio_r8(pb);
|
||||
avio_skip(pb, 6);
|
||||
size = PKTSIZE(avio_rl32(pb));
|
||||
if (vst && subtype == 'R') {
|
||||
vst->codec->extradata_size = size;
|
||||
vst->codec->extradata = av_malloc(size);
|
||||
avio_read(pb, vst->codec->extradata, size);
|
||||
size = 0;
|
||||
if (!myth)
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
case NUV_MYTHEXT:
|
||||
avio_skip(pb, 7);
|
||||
size = PKTSIZE(avio_rl32(pb));
|
||||
if (size != 128 * 4)
|
||||
break;
|
||||
avio_rl32(pb); // version
|
||||
if (vst) {
|
||||
vst->codec->codec_tag = avio_rl32(pb);
|
||||
vst->codec->codec_id =
|
||||
ff_codec_get_id(ff_codec_bmp_tags, vst->codec->codec_tag);
|
||||
if (vst->codec->codec_tag == MKTAG('R', 'J', 'P', 'G'))
|
||||
vst->codec->codec_id = AV_CODEC_ID_NUV;
|
||||
} else
|
||||
avio_skip(pb, 4);
|
||||
|
||||
if (ast) {
|
||||
int id;
|
||||
|
||||
ast->codec->codec_tag = avio_rl32(pb);
|
||||
ast->codec->sample_rate = avio_rl32(pb);
|
||||
ast->codec->bits_per_coded_sample = avio_rl32(pb);
|
||||
ast->codec->channels = avio_rl32(pb);
|
||||
ast->codec->channel_layout = 0;
|
||||
|
||||
id = ff_wav_codec_get_id(ast->codec->codec_tag,
|
||||
ast->codec->bits_per_coded_sample);
|
||||
if (id == AV_CODEC_ID_NONE) {
|
||||
id = ff_codec_get_id(nuv_audio_tags, ast->codec->codec_tag);
|
||||
if (id == AV_CODEC_ID_PCM_S16LE)
|
||||
id = ff_get_pcm_codec_id(ast->codec->bits_per_coded_sample,
|
||||
0, 0, ~1);
|
||||
}
|
||||
break;
|
||||
case NUV_MYTHEXT:
|
||||
avio_skip(pb, 7);
|
||||
size = PKTSIZE(avio_rl32(pb));
|
||||
if (size != 128 * 4)
|
||||
break;
|
||||
avio_rl32(pb); // version
|
||||
if (vst) {
|
||||
vst->codec->codec_tag = avio_rl32(pb);
|
||||
vst->codec->codec_id =
|
||||
ff_codec_get_id(ff_codec_bmp_tags, vst->codec->codec_tag);
|
||||
if (vst->codec->codec_tag == MKTAG('R', 'J', 'P', 'G'))
|
||||
vst->codec->codec_id = AV_CODEC_ID_NUV;
|
||||
} else
|
||||
avio_skip(pb, 4);
|
||||
ast->codec->codec_id = id;
|
||||
|
||||
if (ast) {
|
||||
int id;
|
||||
ast->need_parsing = AVSTREAM_PARSE_FULL;
|
||||
} else
|
||||
avio_skip(pb, 4 * 4);
|
||||
|
||||
ast->codec->codec_tag = avio_rl32(pb);
|
||||
ast->codec->sample_rate = avio_rl32(pb);
|
||||
ast->codec->bits_per_coded_sample = avio_rl32(pb);
|
||||
ast->codec->channels = avio_rl32(pb);
|
||||
ast->codec->channel_layout = 0;
|
||||
|
||||
id = ff_wav_codec_get_id(ast->codec->codec_tag,
|
||||
ast->codec->bits_per_coded_sample);
|
||||
if (id == AV_CODEC_ID_NONE) {
|
||||
id = ff_codec_get_id(nuv_audio_tags,
|
||||
ast->codec->codec_tag);
|
||||
if (id == AV_CODEC_ID_PCM_S16LE)
|
||||
id = ff_get_pcm_codec_id(ast->codec->bits_per_coded_sample,
|
||||
0, 0, ~1);
|
||||
}
|
||||
ast->codec->codec_id = id;
|
||||
|
||||
ast->need_parsing = AVSTREAM_PARSE_FULL;
|
||||
} else
|
||||
avio_skip(pb, 4 * 4);
|
||||
|
||||
size -= 6 * 4;
|
||||
avio_skip(pb, size);
|
||||
return 1;
|
||||
case NUV_SEEKP:
|
||||
size = 11;
|
||||
break;
|
||||
default:
|
||||
avio_skip(pb, 7);
|
||||
size = PKTSIZE(avio_rl32(pb));
|
||||
break;
|
||||
size -= 6 * 4;
|
||||
avio_skip(pb, size);
|
||||
return 1;
|
||||
case NUV_SEEKP:
|
||||
size = 11;
|
||||
break;
|
||||
default:
|
||||
avio_skip(pb, 7);
|
||||
size = PKTSIZE(avio_rl32(pb));
|
||||
break;
|
||||
}
|
||||
avio_skip(pb, size);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int nuv_header(AVFormatContext *s) {
|
||||
static int nuv_header(AVFormatContext *s)
|
||||
{
|
||||
NUVContext *ctx = s->priv_data;
|
||||
AVIOContext *pb = s->pb;
|
||||
char id_string[12];
|
||||
@ -149,16 +154,17 @@ static int nuv_header(AVFormatContext *s) {
|
||||
int is_mythtv, width, height, v_packs, a_packs;
|
||||
int stream_nr = 0;
|
||||
AVStream *vst = NULL, *ast = NULL;
|
||||
|
||||
avio_read(pb, id_string, 12);
|
||||
is_mythtv = !memcmp(id_string, "MythTVVideo", 12);
|
||||
avio_skip(pb, 5); // version string
|
||||
avio_skip(pb, 3); // padding
|
||||
width = avio_rl32(pb);
|
||||
avio_skip(pb, 5); // version string
|
||||
avio_skip(pb, 3); // padding
|
||||
width = avio_rl32(pb);
|
||||
height = avio_rl32(pb);
|
||||
avio_rl32(pb); // unused, "desiredwidth"
|
||||
avio_rl32(pb); // unused, "desiredheight"
|
||||
avio_r8(pb); // 'P' == progressive, 'I' == interlaced
|
||||
avio_skip(pb, 3); // padding
|
||||
avio_rl32(pb); // unused, "desiredwidth"
|
||||
avio_rl32(pb); // unused, "desiredheight"
|
||||
avio_r8(pb); // 'P' == progressive, 'I' == interlaced
|
||||
avio_skip(pb, 3); // padding
|
||||
aspect = av_int2double(avio_rl64(pb));
|
||||
if (aspect > 0.9999 && aspect < 1.0001)
|
||||
aspect = 4.0 / 3.0;
|
||||
@ -173,15 +179,16 @@ static int nuv_header(AVFormatContext *s) {
|
||||
|
||||
if (v_packs) {
|
||||
ctx->v_id = stream_nr++;
|
||||
vst = avformat_new_stream(s, NULL);
|
||||
vst = avformat_new_stream(s, NULL);
|
||||
if (!vst)
|
||||
return AVERROR(ENOMEM);
|
||||
vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
|
||||
vst->codec->codec_id = AV_CODEC_ID_NUV;
|
||||
vst->codec->width = width;
|
||||
vst->codec->height = height;
|
||||
vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
|
||||
vst->codec->codec_id = AV_CODEC_ID_NUV;
|
||||
vst->codec->width = width;
|
||||
vst->codec->height = height;
|
||||
vst->codec->bits_per_coded_sample = 10;
|
||||
vst->sample_aspect_ratio = av_d2q(aspect * height / width, 10000);
|
||||
vst->sample_aspect_ratio = av_d2q(aspect * height / width,
|
||||
10000);
|
||||
#if FF_API_R_FRAME_RATE
|
||||
vst->r_frame_rate =
|
||||
#endif
|
||||
@ -192,16 +199,16 @@ static int nuv_header(AVFormatContext *s) {
|
||||
|
||||
if (a_packs) {
|
||||
ctx->a_id = stream_nr++;
|
||||
ast = avformat_new_stream(s, NULL);
|
||||
ast = avformat_new_stream(s, NULL);
|
||||
if (!ast)
|
||||
return AVERROR(ENOMEM);
|
||||
ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
|
||||
ast->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
|
||||
ast->codec->channels = 2;
|
||||
ast->codec->channel_layout = AV_CH_LAYOUT_STEREO;
|
||||
ast->codec->sample_rate = 44100;
|
||||
ast->codec->bit_rate = 2 * 2 * 44100 * 8;
|
||||
ast->codec->block_align = 2 * 2;
|
||||
ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
|
||||
ast->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
|
||||
ast->codec->channels = 2;
|
||||
ast->codec->channel_layout = AV_CH_LAYOUT_STEREO;
|
||||
ast->codec->sample_rate = 44100;
|
||||
ast->codec->bit_rate = 2 * 2 * 44100 * 8;
|
||||
ast->codec->block_align = 2 * 2;
|
||||
ast->codec->bits_per_coded_sample = 16;
|
||||
avpriv_set_pts_info(ast, 32, 1, 1000);
|
||||
} else
|
||||
@ -209,75 +216,83 @@ static int nuv_header(AVFormatContext *s) {
|
||||
|
||||
get_codec_data(pb, vst, ast, is_mythtv);
|
||||
ctx->rtjpg_video = vst && vst->codec->codec_id == AV_CODEC_ID_NUV;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define HDRSIZE 12
|
||||
|
||||
static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
|
||||
static int nuv_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
{
|
||||
NUVContext *ctx = s->priv_data;
|
||||
AVIOContext *pb = s->pb;
|
||||
uint8_t hdr[HDRSIZE];
|
||||
nuv_frametype frametype;
|
||||
int ret, size;
|
||||
|
||||
while (!url_feof(pb)) {
|
||||
int copyhdrsize = ctx->rtjpg_video ? HDRSIZE : 0;
|
||||
uint64_t pos = avio_tell(pb);
|
||||
uint64_t pos = avio_tell(pb);
|
||||
|
||||
ret = avio_read(pb, hdr, HDRSIZE);
|
||||
if (ret < HDRSIZE)
|
||||
return ret < 0 ? ret : AVERROR(EIO);
|
||||
frametype = hdr[0];
|
||||
size = PKTSIZE(AV_RL32(&hdr[8]));
|
||||
switch (frametype) {
|
||||
case NUV_EXTRADATA:
|
||||
if (!ctx->rtjpg_video) {
|
||||
avio_skip(pb, size);
|
||||
break;
|
||||
}
|
||||
case NUV_VIDEO:
|
||||
if (ctx->v_id < 0) {
|
||||
av_log(s, AV_LOG_ERROR, "Video packet in file without video stream!\n");
|
||||
avio_skip(pb, size);
|
||||
break;
|
||||
}
|
||||
ret = av_new_packet(pkt, copyhdrsize + size);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
pkt->pos = pos;
|
||||
pkt->flags |= hdr[2] == 0 ? AV_PKT_FLAG_KEY : 0;
|
||||
pkt->pts = AV_RL32(&hdr[4]);
|
||||
pkt->stream_index = ctx->v_id;
|
||||
memcpy(pkt->data, hdr, copyhdrsize);
|
||||
ret = avio_read(pb, pkt->data + copyhdrsize, size);
|
||||
if (ret < 0) {
|
||||
av_free_packet(pkt);
|
||||
return ret;
|
||||
}
|
||||
if (ret < size)
|
||||
av_shrink_packet(pkt, copyhdrsize + ret);
|
||||
return 0;
|
||||
case NUV_AUDIO:
|
||||
if (ctx->a_id < 0) {
|
||||
av_log(s, AV_LOG_ERROR, "Audio packet in file without audio stream!\n");
|
||||
avio_skip(pb, size);
|
||||
break;
|
||||
}
|
||||
ret = av_get_packet(pb, pkt, size);
|
||||
pkt->flags |= AV_PKT_FLAG_KEY;
|
||||
pkt->pos = pos;
|
||||
pkt->pts = AV_RL32(&hdr[4]);
|
||||
pkt->stream_index = ctx->a_id;
|
||||
if (ret < 0) return ret;
|
||||
return 0;
|
||||
case NUV_SEEKP:
|
||||
// contains no data, size value is invalid
|
||||
break;
|
||||
default:
|
||||
frametype = hdr[0];
|
||||
size = PKTSIZE(AV_RL32(&hdr[8]));
|
||||
|
||||
switch (frametype) {
|
||||
case NUV_EXTRADATA:
|
||||
if (!ctx->rtjpg_video) {
|
||||
avio_skip(pb, size);
|
||||
break;
|
||||
}
|
||||
case NUV_VIDEO:
|
||||
if (ctx->v_id < 0) {
|
||||
av_log(s, AV_LOG_ERROR, "Video packet in file without video stream!\n");
|
||||
avio_skip(pb, size);
|
||||
break;
|
||||
}
|
||||
ret = av_new_packet(pkt, copyhdrsize + size);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
pkt->pos = pos;
|
||||
pkt->flags |= hdr[2] == 0 ? AV_PKT_FLAG_KEY : 0;
|
||||
pkt->pts = AV_RL32(&hdr[4]);
|
||||
pkt->stream_index = ctx->v_id;
|
||||
memcpy(pkt->data, hdr, copyhdrsize);
|
||||
ret = avio_read(pb, pkt->data + copyhdrsize, size);
|
||||
if (ret < 0) {
|
||||
av_free_packet(pkt);
|
||||
return ret;
|
||||
}
|
||||
if (ret < size)
|
||||
av_shrink_packet(pkt, copyhdrsize + ret);
|
||||
return 0;
|
||||
case NUV_AUDIO:
|
||||
if (ctx->a_id < 0) {
|
||||
av_log(s, AV_LOG_ERROR, "Audio packet in file without audio stream!\n");
|
||||
avio_skip(pb, size);
|
||||
break;
|
||||
}
|
||||
ret = av_get_packet(pb, pkt, size);
|
||||
pkt->flags |= AV_PKT_FLAG_KEY;
|
||||
pkt->pos = pos;
|
||||
pkt->pts = AV_RL32(&hdr[4]);
|
||||
pkt->stream_index = ctx->a_id;
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
return 0;
|
||||
case NUV_SEEKP:
|
||||
// contains no data, size value is invalid
|
||||
break;
|
||||
default:
|
||||
avio_skip(pb, size);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return AVERROR(EIO);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user