apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-01 13:03:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

avio: avio_ prefixes for get_* functions

Browse Source 
In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return
something useful.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e83)
This commit is contained in:
Anton Khirnov
2011-02-21 16:43:01 +01:00
committed by Michael Niedermayer
parent 6a786b15c3
commit e63a362857
107 changed files with 1821 additions and 1776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
libavformat/r3d.c
View File

@@ -39,10 +39,10 @@ typedef struct {
static int read_atom(AVFormatContext *s, Atom *atom)
{
atom->offset = url_ftell(s->pb);
atom->size = get_be32(s->pb);
atom->size = avio_rb32(s->pb);
if (atom->size < 8)
return -1;
atom->tag = get_le32(s->pb);
atom->tag = avio_rl32(s->pb);
av_dlog(s, "atom %d %.4s offset %#llx\n",
atom->size, (char*)&atom->tag, atom->offset);
return atom->size;
@@ -59,31 +59,31 @@ static int r3d_read_red1(AVFormatContext *s)
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_JPEG2000;
tmp = get_byte(s->pb); // major version
tmp2 = get_byte(s->pb); // minor version
tmp = avio_r8(s->pb); // major version
tmp2 = avio_r8(s->pb); // minor version
av_dlog(s, "version %d.%d\n", tmp, tmp2);
tmp = get_be16(s->pb); // unknown
tmp = avio_rb16(s->pb); // unknown
av_dlog(s, "unknown1 %d\n", tmp);
tmp = get_be32(s->pb);
tmp = avio_rb32(s->pb);
av_set_pts_info(st, 32, 1, tmp);
tmp = get_be32(s->pb); // filenum
tmp = avio_rb32(s->pb); // filenum
av_dlog(s, "filenum %d\n", tmp);
url_fskip(s->pb, 32); // unknown
st->codec->width = get_be32(s->pb);
st->codec->height = get_be32(s->pb);
st->codec->width = avio_rb32(s->pb);
st->codec->height = avio_rb32(s->pb);
tmp = get_be16(s->pb); // unknown
tmp = avio_rb16(s->pb); // unknown
av_dlog(s, "unknown2 %d\n", tmp);
st->codec->time_base.den = get_be16(s->pb);
st->codec->time_base.num = get_be16(s->pb);
st->codec->time_base.den = avio_rb16(s->pb);
st->codec->time_base.num = avio_rb16(s->pb);
tmp = get_byte(s->pb); // audio channels
tmp = avio_r8(s->pb); // audio channels
av_dlog(s, "audio channels %d\n", tmp);
if (tmp > 0) {
AVStream *ast = av_new_stream(s, 1);
@@ -95,7 +95,7 @@ static int r3d_read_red1(AVFormatContext *s)
av_set_pts_info(ast, 32, 1, st->time_base.den);
}
get_buffer(s->pb, filename, 257);
avio_read(s->pb, filename, 257);
filename[sizeof(filename)-1] = 0;
av_metadata_set2(&st->metadata, "filename", filename, 0);
@@ -120,7 +120,7 @@ static int r3d_read_rdvo(AVFormatContext *s, Atom *atom)
return AVERROR(ENOMEM);
for (i = 0; i < r3d->video_offsets_count; i++) {
r3d->video_offsets[i] = get_be32(s->pb);
r3d->video_offsets[i] = avio_rb32(s->pb);
if (!r3d->video_offsets[i]) {
r3d->video_offsets_count = i;
break;
@@ -141,15 +141,15 @@ static void r3d_read_reos(AVFormatContext *s)
R3DContext *r3d = s->priv_data;
int tmp;
r3d->rdvo_offset = get_be32(s->pb);
get_be32(s->pb); // rdvs offset
get_be32(s->pb); // rdao offset
get_be32(s->pb); // rdas offset
r3d->rdvo_offset = avio_rb32(s->pb);
avio_rb32(s->pb); // rdvs offset
avio_rb32(s->pb); // rdao offset
avio_rb32(s->pb); // rdas offset
tmp = get_be32(s->pb);
tmp = avio_rb32(s->pb);
av_dlog(s, "num video chunks %d\n", tmp);
tmp = get_be32(s->pb);
tmp = avio_rb32(s->pb);
av_dlog(s, "num audio chunks %d\n", tmp);
url_fskip(s->pb, 6*4);
@@ -214,31 +214,31 @@ static int r3d_read_redv(AVFormatContext *s, AVPacket *pkt, Atom *atom)
unsigned dts;
int ret;
dts = get_be32(s->pb);
dts = avio_rb32(s->pb);
tmp = get_be32(s->pb);
tmp = avio_rb32(s->pb);
av_dlog(s, "frame num %d\n", tmp);
tmp = get_byte(s->pb); // major version
tmp2 = get_byte(s->pb); // minor version
tmp = avio_r8(s->pb); // major version
tmp2 = avio_r8(s->pb); // minor version
av_dlog(s, "version %d.%d\n", tmp, tmp2);
tmp = get_be16(s->pb); // unknown
tmp = avio_rb16(s->pb); // unknown
av_dlog(s, "unknown %d\n", tmp);
if (tmp > 4) {
tmp = get_be16(s->pb); // unknown
tmp = avio_rb16(s->pb); // unknown
av_dlog(s, "unknown %d\n", tmp);
tmp = get_be16(s->pb); // unknown
tmp = avio_rb16(s->pb); // unknown
av_dlog(s, "unknown %d\n", tmp);
tmp = get_be32(s->pb);
tmp = avio_rb32(s->pb);
av_dlog(s, "width %d\n", tmp);
tmp = get_be32(s->pb);
tmp = avio_rb32(s->pb);
av_dlog(s, "height %d\n", tmp);
tmp = get_be32(s->pb);
tmp = avio_rb32(s->pb);
av_dlog(s, "metadata len %d\n", tmp);
}
tmp = atom->size - 8 - (url_ftell(s->pb) - pos);
@@ -268,23 +268,23 @@ static int r3d_read_reda(AVFormatContext *s, AVPacket *pkt, Atom *atom)
unsigned dts;
int ret;
dts = get_be32(s->pb);
dts = avio_rb32(s->pb);
st->codec->sample_rate = get_be32(s->pb);
st->codec->sample_rate = avio_rb32(s->pb);
samples = get_be32(s->pb);
samples = avio_rb32(s->pb);
tmp = get_be32(s->pb);
tmp = avio_rb32(s->pb);
av_dlog(s, "packet num %d\n", tmp);
tmp = get_be16(s->pb); // unkown
tmp = avio_rb16(s->pb); // unkown
av_dlog(s, "unknown %d\n", tmp);
tmp = get_byte(s->pb); // major version
tmp2 = get_byte(s->pb); // minor version
tmp = avio_r8(s->pb); // major version
tmp2 = avio_r8(s->pb); // minor version
av_dlog(s, "version %d.%d\n", tmp, tmp2);
tmp = get_be32(s->pb); // unknown
tmp = avio_rb32(s->pb); // unknown
av_dlog(s, "unknown %d\n", tmp);
size = atom->size - 8 - (url_ftell(s->pb) - pos);