Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
1b2fc2ae
Commit
1b2fc2ae
authored
May 31, 2010
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/mp4ff: rename mp4_context to mp4ff_input_stream
parent
58a75f0b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
mp4ff_decoder_plugin.c
src/decoder/mp4ff_decoder_plugin.c
+9
-9
No files found.
src/decoder/mp4ff_decoder_plugin.c
View file @
1b2fc2ae
...
...
@@ -36,7 +36,7 @@
/* all code here is either based on or copied from FAAD2's frontend code */
struct
mp4
_context
{
struct
mp4
ff_input_stream
{
struct
decoder
*
decoder
;
struct
input_stream
*
input_stream
;
};
...
...
@@ -90,17 +90,17 @@ mp4_get_aac_track(mp4ff_t * infile, faacDecHandle decoder,
static
uint32_t
mp4_read
(
void
*
user_data
,
void
*
buffer
,
uint32_t
length
)
{
struct
mp4
_context
*
ctx
=
user_data
;
struct
mp4
ff_input_stream
*
mis
=
user_data
;
return
decoder_read
(
ctx
->
decoder
,
ctx
->
input_stream
,
buffer
,
length
);
return
decoder_read
(
mis
->
decoder
,
mis
->
input_stream
,
buffer
,
length
);
}
static
uint32_t
mp4_seek
(
void
*
user_data
,
uint64_t
position
)
{
struct
mp4
_context
*
ctx
=
user_data
;
struct
mp4
ff_input_stream
*
mis
=
user_data
;
return
input_stream_seek
(
ctx
->
input_stream
,
position
,
SEEK_SET
,
NULL
)
return
input_stream_seek
(
mis
->
input_stream
,
position
,
SEEK_SET
,
NULL
)
?
0
:
-
1
;
}
...
...
@@ -150,14 +150,14 @@ mp4_faad_new(mp4ff_t *mp4fh, int *track_r, struct audio_format *audio_format)
static
void
mp4_decode
(
struct
decoder
*
mpd_decoder
,
struct
input_stream
*
input_stream
)
{
struct
mp4
_context
ctx
=
{
struct
mp4
ff_input_stream
mis
=
{
.
decoder
=
mpd_decoder
,
.
input_stream
=
input_stream
,
};
mp4ff_callback_t
callback
=
{
.
read
=
mp4_read
,
.
seek
=
mp4_seek
,
.
user_data
=
&
ctx
,
.
user_data
=
&
mis
,
};
mp4ff_t
*
mp4fh
;
int32_t
track
;
...
...
@@ -356,14 +356,14 @@ static struct tag *
mp4_stream_tag
(
struct
input_stream
*
is
)
{
struct
tag
*
ret
=
NULL
;
struct
mp4
_context
ctx
=
{
struct
mp4
ff_input_stream
mis
=
{
.
decoder
=
NULL
,
.
input_stream
=
is
,
};
mp4ff_callback_t
callback
=
{
.
read
=
mp4_read
,
.
seek
=
mp4_seek
,
.
user_data
=
&
ctx
,
.
user_data
=
&
mis
,
};
mp4ff_t
*
mp4fh
;
int32_t
track
;
...
...
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