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
078d83ca
Commit
078d83ca
authored
Oct 30, 2008
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: removed debug messages
We don't need those anymore, they just fill the log.
parent
b180d0b4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
35 deletions
+5
-35
ffmpeg_plugin.c
src/decoder/ffmpeg_plugin.c
+5
-35
No files found.
src/decoder/ffmpeg_plugin.c
View file @
078d83ca
...
@@ -87,15 +87,12 @@ static int mpdurl_read(URLContext *h, unsigned char *buf, int size)
...
@@ -87,15 +87,12 @@ static int mpdurl_read(URLContext *h, unsigned char *buf, int size)
while
(
true
)
{
while
(
true
)
{
ret
=
input_stream_read
(
base
->
input
,
(
void
*
)
buf
,
size
);
ret
=
input_stream_read
(
base
->
input
,
(
void
*
)
buf
,
size
);
if
(
ret
==
0
)
{
if
(
ret
==
0
)
{
DEBUG
(
"ret 0
\n
"
);
if
(
input_stream_eof
(
base
->
input
)
||
if
(
input_stream_eof
(
base
->
input
)
||
(
base
->
decoder
&&
(
base
->
decoder
&&
decoder_get_command
(
base
->
decoder
)
!=
DECODE_COMMAND_NONE
))
{
decoder_get_command
(
base
->
decoder
)
!=
DECODE_COMMAND_NONE
))
DEBUG
(
"eof stream
\n
"
);
return
ret
;
return
ret
;
}
else
{
else
my_usleep
(
10000
);
my_usleep
(
10000
);
}
}
else
{
}
else
{
break
;
break
;
}
}
...
@@ -201,10 +198,8 @@ ffmpeg_helper(struct input_stream *input, int (*callback)(BasePtrs *ptrs),
...
@@ -201,10 +198,8 @@ ffmpeg_helper(struct input_stream *input, int (*callback)(BasePtrs *ptrs),
ptrs
->
aCodec
=
aCodec
;
ptrs
->
aCodec
=
aCodec
;
ret
=
(
*
callback
)(
ptrs
);
ret
=
(
*
callback
)(
ptrs
);
}
else
{
}
else
ret
=
0
;
ret
=
0
;
DEBUG
(
"playable
\n
"
);
}
avcodec_close
(
aCodecCtx
);
avcodec_close
(
aCodecCtx
);
av_close_input_file
(
pFormatCtx
);
av_close_input_file
(
pFormatCtx
);
...
@@ -238,8 +233,6 @@ static int ffmpeg_decode_internal(BasePtrs *base)
...
@@ -238,8 +233,6 @@ static int ffmpeg_decode_internal(BasePtrs *base)
total_time
=
0
;
total_time
=
0
;
DEBUG
(
"decoder_start
\n
"
);
if
(
aCodecCtx
->
channels
>
2
)
{
if
(
aCodecCtx
->
channels
>
2
)
{
aCodecCtx
->
channels
=
2
;
aCodecCtx
->
channels
=
2
;
}
}
...
@@ -248,29 +241,18 @@ static int ffmpeg_decode_internal(BasePtrs *base)
...
@@ -248,29 +241,18 @@ static int ffmpeg_decode_internal(BasePtrs *base)
audio_format
.
sample_rate
=
(
unsigned
int
)
aCodecCtx
->
sample_rate
;
audio_format
.
sample_rate
=
(
unsigned
int
)
aCodecCtx
->
sample_rate
;
audio_format
.
channels
=
aCodecCtx
->
channels
;
audio_format
.
channels
=
aCodecCtx
->
channels
;
// frame_count = afGetFrameCount(af_fp, AF_DEFAULT_TRACK);
// total_time = ((float)frame_count / (float)audio_format.sample_rate);
//there is some problem with this on some demux (mp3 at least)
//there is some problem with this on some demux (mp3 at least)
if
(
pFormatCtx
->
duration
!=
(
int
)
AV_NOPTS_VALUE
)
{
if
(
pFormatCtx
->
duration
!=
(
int
)
AV_NOPTS_VALUE
)
{
total_time
=
pFormatCtx
->
duration
/
AV_TIME_BASE
;
total_time
=
pFormatCtx
->
duration
/
AV_TIME_BASE
;
}
}
DEBUG
(
"ffmpeg sample rate: %dHz %d channels
\n
"
,
aCodecCtx
->
sample_rate
,
aCodecCtx
->
channels
);
decoder_initialized
(
decoder
,
&
audio_format
,
total_time
);
decoder_initialized
(
decoder
,
&
audio_format
,
total_time
);
position
=
0
;
position
=
0
;
DEBUG
(
"duration:%d (%d secs)
\n
"
,
(
int
)
pFormatCtx
->
duration
,
(
int
)
total_time
);
do
{
do
{
if
(
decoder_get_command
(
decoder
)
==
DECODE_COMMAND_SEEK
)
{
if
(
decoder_get_command
(
decoder
)
==
DECODE_COMMAND_SEEK
)
{
DEBUG
(
"seek
\n
"
);
current
=
decoder_seek_where
(
decoder
)
*
AV_TIME_BASE
;
current
=
decoder_seek_where
(
decoder
)
*
AV_TIME_BASE
;
if
(
av_seek_frame
(
pFormatCtx
,
-
1
,
current
,
0
)
<
0
)
{
if
(
av_seek_frame
(
pFormatCtx
,
-
1
,
current
,
0
)
<
0
)
{
...
@@ -294,15 +276,11 @@ static int ffmpeg_decode_internal(BasePtrs *base)
...
@@ -294,15 +276,11 @@ static int ffmpeg_decode_internal(BasePtrs *base)
packet
.
size
);
packet
.
size
);
if
(
len
>=
0
)
{
if
(
len
>=
0
)
{
if
(
audio_size
>=
0
)
{
if
(
audio_size
>=
0
)
// DEBUG("sending data %d/%d\n", audio_size, len);
decoder_data
(
decoder
,
NULL
,
1
,
decoder_data
(
decoder
,
NULL
,
1
,
audio_buf
,
audio_size
,
audio_buf
,
audio_size
,
position
,
//(float)current / (float)audio_format.sample_rate,
position
,
//(float)current / (float)audio_format.sample_rate,
aCodecCtx
->
bit_rate
/
1000
,
NULL
);
aCodecCtx
->
bit_rate
/
1000
,
NULL
);
}
}
else
{
}
else
{
WARNING
(
"skiping frame!
\n
"
);
WARNING
(
"skiping frame!
\n
"
);
}
}
...
@@ -314,7 +292,6 @@ static int ffmpeg_decode_internal(BasePtrs *base)
...
@@ -314,7 +292,6 @@ static int ffmpeg_decode_internal(BasePtrs *base)
}
}
}
while
(
decoder_get_command
(
decoder
)
!=
DECODE_COMMAND_STOP
);
}
while
(
decoder_get_command
(
decoder
)
!=
DECODE_COMMAND_STOP
);
DEBUG
(
"decoder finish
\n
"
);
return
0
;
return
0
;
}
}
...
@@ -322,18 +299,11 @@ static bool
...
@@ -322,18 +299,11 @@ static bool
ffmpeg_decode
(
struct
decoder
*
decoder
,
struct
input_stream
*
input
)
ffmpeg_decode
(
struct
decoder
*
decoder
,
struct
input_stream
*
input
)
{
{
BasePtrs
base
;
BasePtrs
base
;
bool
ret
;
DEBUG
(
"decode start
\n
"
);
base
.
input
=
input
;
base
.
input
=
input
;
base
.
decoder
=
decoder
;
base
.
decoder
=
decoder
;
ret
=
ffmpeg_helper
(
input
,
ffmpeg_decode_internal
,
&
base
)
==
0
;
return
ffmpeg_helper
(
input
,
ffmpeg_decode_internal
,
&
base
)
==
0
;
DEBUG
(
"decode finish
\n
"
);
return
ret
;
}
}
static
int
ffmpeg_tag_internal
(
BasePtrs
*
base
)
static
int
ffmpeg_tag_internal
(
BasePtrs
*
base
)
...
...
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