Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
f7fe41a0
Commit
f7fe41a0
authored
Jan 31, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: rename AVInputFormat.value to raw_codec_id.
It's only used by raw demuxers for storing the codec id.
parent
9a463917
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
24 additions
and
24 deletions
+24
-24
aacdec.c
libavformat/aacdec.c
+2
-2
ac3dec.c
libavformat/ac3dec.c
+2
-2
adxdec.c
libavformat/adxdec.c
+2
-2
avformat.h
libavformat/avformat.h
+2
-2
dtsdec.c
libavformat/dtsdec.c
+1
-1
flacdec.c
libavformat/flacdec.c
+1
-1
gsmdec.c
libavformat/gsmdec.c
+2
-2
ingenientdec.c
libavformat/ingenientdec.c
+1
-1
pcmdec.c
libavformat/pcmdec.c
+1
-1
rawdec.c
libavformat/rawdec.c
+8
-8
rawdec.h
libavformat/rawdec.h
+1
-1
rawvideodec.c
libavformat/rawvideodec.c
+1
-1
No files found.
libavformat/aacdec.c
View file @
f7fe41a0
...
@@ -70,7 +70,7 @@ static int adts_aac_read_header(AVFormatContext *s)
...
@@ -70,7 +70,7 @@ static int adts_aac_read_header(AVFormatContext *s)
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_id
=
s
->
iformat
->
value
;
st
->
codec
->
codec_id
=
s
->
iformat
->
raw_codec_id
;
st
->
need_parsing
=
AVSTREAM_PARSE_FULL
;
st
->
need_parsing
=
AVSTREAM_PARSE_FULL
;
ff_id3v1_read
(
s
);
ff_id3v1_read
(
s
);
...
@@ -89,5 +89,5 @@ AVInputFormat ff_aac_demuxer = {
...
@@ -89,5 +89,5 @@ AVInputFormat ff_aac_demuxer = {
.
read_packet
=
ff_raw_read_partial_packet
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"aac"
,
.
extensions
=
"aac"
,
.
value
=
CODEC_ID_AAC
,
.
raw_codec_id
=
CODEC_ID_AAC
,
};
};
libavformat/ac3dec.c
View file @
f7fe41a0
...
@@ -78,7 +78,7 @@ AVInputFormat ff_ac3_demuxer = {
...
@@ -78,7 +78,7 @@ AVInputFormat ff_ac3_demuxer = {
.
read_packet
=
ff_raw_read_partial_packet
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"ac3"
,
.
extensions
=
"ac3"
,
.
value
=
CODEC_ID_AC3
,
.
raw_codec_id
=
CODEC_ID_AC3
,
};
};
#endif
#endif
...
@@ -96,6 +96,6 @@ AVInputFormat ff_eac3_demuxer = {
...
@@ -96,6 +96,6 @@ AVInputFormat ff_eac3_demuxer = {
.
read_packet
=
ff_raw_read_partial_packet
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"eac3"
,
.
extensions
=
"eac3"
,
.
value
=
CODEC_ID_EAC3
,
.
raw_codec_id
=
CODEC_ID_EAC3
,
};
};
#endif
#endif
libavformat/adxdec.c
View file @
f7fe41a0
...
@@ -94,7 +94,7 @@ static int adx_read_header(AVFormatContext *s)
...
@@ -94,7 +94,7 @@ static int adx_read_header(AVFormatContext *s)
return
ret
;
return
ret
;
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_id
=
s
->
iformat
->
value
;
st
->
codec
->
codec_id
=
s
->
iformat
->
raw_codec_id
;
avpriv_set_pts_info
(
st
,
64
,
BLOCK_SAMPLES
,
avctx
->
sample_rate
);
avpriv_set_pts_info
(
st
,
64
,
BLOCK_SAMPLES
,
avctx
->
sample_rate
);
...
@@ -108,6 +108,6 @@ AVInputFormat ff_adx_demuxer = {
...
@@ -108,6 +108,6 @@ AVInputFormat ff_adx_demuxer = {
.
read_header
=
adx_read_header
,
.
read_header
=
adx_read_header
,
.
read_packet
=
adx_read_packet
,
.
read_packet
=
adx_read_packet
,
.
extensions
=
"adx"
,
.
extensions
=
"adx"
,
.
value
=
CODEC_ID_ADPCM_ADX
,
.
raw_codec_id
=
CODEC_ID_ADPCM_ADX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
};
};
libavformat/avformat.h
View file @
f7fe41a0
...
@@ -415,9 +415,9 @@ typedef struct AVInputFormat {
...
@@ -415,9 +415,9 @@ typedef struct AVInputFormat {
struct
AVInputFormat
*
next
;
struct
AVInputFormat
*
next
;
/**
/**
*
General purpose read-only value that the format can us
e.
*
Raw demuxers store their codec ID her
e.
*/
*/
int
value
;
int
raw_codec_id
;
/**
/**
* Size of private data so that it can be allocated in the wrapper.
* Size of private data so that it can be allocated in the wrapper.
...
...
libavformat/dtsdec.c
View file @
f7fe41a0
...
@@ -73,5 +73,5 @@ AVInputFormat ff_dts_demuxer = {
...
@@ -73,5 +73,5 @@ AVInputFormat ff_dts_demuxer = {
.
read_packet
=
ff_raw_read_partial_packet
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"dts"
,
.
extensions
=
"dts"
,
.
value
=
CODEC_ID_DTS
,
.
raw_codec_id
=
CODEC_ID_DTS
,
};
};
libavformat/flacdec.c
View file @
f7fe41a0
...
@@ -157,5 +157,5 @@ AVInputFormat ff_flac_demuxer = {
...
@@ -157,5 +157,5 @@ AVInputFormat ff_flac_demuxer = {
.
read_packet
=
ff_raw_read_partial_packet
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"flac"
,
.
extensions
=
"flac"
,
.
value
=
CODEC_ID_FLAC
,
.
raw_codec_id
=
CODEC_ID_FLAC
,
};
};
libavformat/gsmdec.c
View file @
f7fe41a0
...
@@ -62,7 +62,7 @@ static int gsm_read_header(AVFormatContext *s)
...
@@ -62,7 +62,7 @@ static int gsm_read_header(AVFormatContext *s)
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_id
=
s
->
iformat
->
value
;
st
->
codec
->
codec_id
=
s
->
iformat
->
raw_codec_id
;
st
->
codec
->
channels
=
1
;
st
->
codec
->
channels
=
1
;
st
->
codec
->
sample_rate
=
c
->
sample_rate
;
st
->
codec
->
sample_rate
=
c
->
sample_rate
;
st
->
codec
->
bit_rate
=
GSM_BLOCK_SIZE
*
8
*
c
->
sample_rate
/
GSM_BLOCK_SAMPLES
;
st
->
codec
->
bit_rate
=
GSM_BLOCK_SIZE
*
8
*
c
->
sample_rate
/
GSM_BLOCK_SAMPLES
;
...
@@ -94,6 +94,6 @@ AVInputFormat ff_gsm_demuxer = {
...
@@ -94,6 +94,6 @@ AVInputFormat ff_gsm_demuxer = {
.
read_packet
=
gsm_read_packet
,
.
read_packet
=
gsm_read_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"gsm"
,
.
extensions
=
"gsm"
,
.
value
=
CODEC_ID_GSM
,
.
raw_codec_id
=
CODEC_ID_GSM
,
.
priv_class
=
&
class
,
.
priv_class
=
&
class
,
};
};
libavformat/ingenientdec.c
View file @
f7fe41a0
...
@@ -68,6 +68,6 @@ AVInputFormat ff_ingenient_demuxer = {
...
@@ -68,6 +68,6 @@ AVInputFormat ff_ingenient_demuxer = {
.
read_packet
=
ingenient_read_packet
,
.
read_packet
=
ingenient_read_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"cgi"
,
// FIXME
.
extensions
=
"cgi"
,
// FIXME
.
value
=
CODEC_ID_MJPEG
,
.
raw_codec_id
=
CODEC_ID_MJPEG
,
.
priv_class
=
&
ingenient_demuxer_class
,
.
priv_class
=
&
ingenient_demuxer_class
,
};
};
libavformat/pcmdec.c
View file @
f7fe41a0
...
@@ -70,7 +70,7 @@ AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \
...
@@ -70,7 +70,7 @@ AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \
.read_seek = pcm_read_seek, \
.read_seek = pcm_read_seek, \
.flags = AVFMT_GENERIC_INDEX, \
.flags = AVFMT_GENERIC_INDEX, \
.extensions = ext, \
.extensions = ext, \
.
value
= codec, \
.
raw_codec_id
= codec, \
.priv_class = &name_ ## _demuxer_class, \
.priv_class = &name_ ## _demuxer_class, \
};
};
...
...
libavformat/rawdec.c
View file @
f7fe41a0
...
@@ -38,7 +38,7 @@ int ff_raw_read_header(AVFormatContext *s)
...
@@ -38,7 +38,7 @@ int ff_raw_read_header(AVFormatContext *s)
if
(
!
st
)
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
id
=
s
->
iformat
->
value
;
id
=
s
->
iformat
->
raw_codec_id
;
if
(
id
==
CODEC_ID_RAWVIDEO
)
{
if
(
id
==
CODEC_ID_RAWVIDEO
)
{
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
}
else
{
}
else
{
...
@@ -126,7 +126,7 @@ int ff_raw_audio_read_header(AVFormatContext *s)
...
@@ -126,7 +126,7 @@ int ff_raw_audio_read_header(AVFormatContext *s)
if
(
!
st
)
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_id
=
s
->
iformat
->
value
;
st
->
codec
->
codec_id
=
s
->
iformat
->
raw_codec_id
;
st
->
need_parsing
=
AVSTREAM_PARSE_FULL
;
st
->
need_parsing
=
AVSTREAM_PARSE_FULL
;
st
->
start_time
=
0
;
st
->
start_time
=
0
;
/* the parameters will be extracted from the compressed bitstream */
/* the parameters will be extracted from the compressed bitstream */
...
@@ -150,7 +150,7 @@ int ff_raw_video_read_header(AVFormatContext *s)
...
@@ -150,7 +150,7 @@ int ff_raw_video_read_header(AVFormatContext *s)
}
}
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
st
->
codec
->
codec_id
=
s
->
iformat
->
value
;
st
->
codec
->
codec_id
=
s
->
iformat
->
raw_codec_id
;
st
->
need_parsing
=
AVSTREAM_PARSE_FULL
;
st
->
need_parsing
=
AVSTREAM_PARSE_FULL
;
if
((
ret
=
av_parse_video_rate
(
&
framerate
,
s1
->
framerate
))
<
0
)
{
if
((
ret
=
av_parse_video_rate
(
&
framerate
,
s1
->
framerate
))
<
0
)
{
...
@@ -182,7 +182,7 @@ AVInputFormat ff_g722_demuxer = {
...
@@ -182,7 +182,7 @@ AVInputFormat ff_g722_demuxer = {
.
read_packet
=
ff_raw_read_partial_packet
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"g722,722"
,
.
extensions
=
"g722,722"
,
.
value
=
CODEC_ID_ADPCM_G722
,
.
raw_codec_id
=
CODEC_ID_ADPCM_G722
,
};
};
#endif
#endif
...
@@ -194,7 +194,7 @@ AVInputFormat ff_latm_demuxer = {
...
@@ -194,7 +194,7 @@ AVInputFormat ff_latm_demuxer = {
.
read_packet
=
ff_raw_read_partial_packet
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"latm"
,
.
extensions
=
"latm"
,
.
value
=
CODEC_ID_AAC_LATM
,
.
raw_codec_id
=
CODEC_ID_AAC_LATM
,
};
};
#endif
#endif
...
@@ -210,7 +210,7 @@ AVInputFormat ff_mlp_demuxer = {
...
@@ -210,7 +210,7 @@ AVInputFormat ff_mlp_demuxer = {
.
read_packet
=
ff_raw_read_partial_packet
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"mlp"
,
.
extensions
=
"mlp"
,
.
value
=
CODEC_ID_MLP
,
.
raw_codec_id
=
CODEC_ID_MLP
,
};
};
#endif
#endif
...
@@ -222,7 +222,7 @@ AVInputFormat ff_truehd_demuxer = {
...
@@ -222,7 +222,7 @@ AVInputFormat ff_truehd_demuxer = {
.
read_packet
=
ff_raw_read_partial_packet
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"thd"
,
.
extensions
=
"thd"
,
.
value
=
CODEC_ID_TRUEHD
,
.
raw_codec_id
=
CODEC_ID_TRUEHD
,
};
};
#endif
#endif
...
@@ -234,7 +234,7 @@ AVInputFormat ff_shorten_demuxer = {
...
@@ -234,7 +234,7 @@ AVInputFormat ff_shorten_demuxer = {
.
read_packet
=
ff_raw_read_partial_packet
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
flags
=
AVFMT_NOBINSEARCH
|
AVFMT_NOGENSEARCH
|
AVFMT_NO_BYTE_SEEK
,
.
flags
=
AVFMT_NOBINSEARCH
|
AVFMT_NOGENSEARCH
|
AVFMT_NO_BYTE_SEEK
,
.
extensions
=
"shn"
,
.
extensions
=
"shn"
,
.
value
=
CODEC_ID_SHORTEN
,
.
raw_codec_id
=
CODEC_ID_SHORTEN
,
};
};
#endif
#endif
...
...
libavformat/rawdec.h
View file @
f7fe41a0
...
@@ -67,7 +67,7 @@ AVInputFormat ff_ ## shortname ## _demuxer = {\
...
@@ -67,7 +67,7 @@ AVInputFormat ff_ ## shortname ## _demuxer = {\
.read_packet = ff_raw_read_partial_packet,\
.read_packet = ff_raw_read_partial_packet,\
.extensions = ext,\
.extensions = ext,\
.flags = AVFMT_GENERIC_INDEX,\
.flags = AVFMT_GENERIC_INDEX,\
.
value
= id,\
.
raw_codec_id
= id,\
.priv_data_size = sizeof(FFRawVideoDemuxerContext),\
.priv_data_size = sizeof(FFRawVideoDemuxerContext),\
.priv_class = &shortname ## _demuxer_class,\
.priv_class = &shortname ## _demuxer_class,\
};
};
...
...
libavformat/rawvideodec.c
View file @
f7fe41a0
...
@@ -68,6 +68,6 @@ AVInputFormat ff_rawvideo_demuxer = {
...
@@ -68,6 +68,6 @@ AVInputFormat ff_rawvideo_demuxer = {
.
read_packet
=
rawvideo_read_packet
,
.
read_packet
=
rawvideo_read_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"yuv,cif,qcif,rgb"
,
.
extensions
=
"yuv,cif,qcif,rgb"
,
.
value
=
CODEC_ID_RAWVIDEO
,
.
raw_codec_id
=
CODEC_ID_RAWVIDEO
,
.
priv_class
=
&
rawvideo_demuxer_class
,
.
priv_class
=
&
rawvideo_demuxer_class
,
};
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment