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
16 years ago
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
sisyphus
0.23.15-alt1
0.23.14-alt1
0.23.13-alt1
0.23.12-alt1
0.23.11-alt1
0.23.8-alt3
0.23.8-alt2
0.23.8-alt1
0.21.24-alt1.1
0.21.24-alt1
0.20.23-alt3
0.20.23-alt2
0.20.23-alt1
0.20.21-alt1
0.20.15-alt1
0.18.14-alt1
0.18.11-alt1.1
0.18.11-alt1
0.18.10-alt1
0.17.0-alt0.3.git050212
0.17.0-alt0.2.git200911
0.17.0-alt0.2.M60P.1.git050212
0.17.0-alt0.1
0.16.2-alt2
0.16.2-alt1
0.15.13-alt1
0.15.13-alt0.M51.1
0.15.13-alt
0.15.8-alt2
0.15.8-alt1
0.15.3-alt1.1
0.15.3-alt1
0.15.0-alt2
0.15.0-alt1
0.14.2
0.14.2-alt1
0.14.2-alt
0.14.1
0.14.1-alt
0.14.0-alt
0.14-alt1
0.14-alt
v0.18.14
v0.18.13
v0.18.12
v0.18.11
v0.18.10
v0.18.9
v0.18.8
v0.18.7
v0.18.6
v0.18.5
v0.18.4
v0.18.3
v0.18.2
v0.17.3
v0.17.2
v0.17.1
v0.17.0-git200911
v0.17.0-git200711
v0.17.0-git050212
v0.16.8
v0.16.5
v0.16.4
v0.16.3
v0.16.2
v0.16.1
v0.16
v0.16_alpha4
v0.16_alpha3
v0.16_alpha2
v0.15.16
v0.15.14
v0.15.13
v0.15.11
v0.15.10
v0.15.9
v0.15.7
v0.15.6
v0.15.5
release-0.16.5
release-0.16.4
release-0.16.3
release-0.16.1
release-0.16
release-0.16_alpha4
release-0.16_alpha3
release-0.16_alpha2
release-0.15.16
release-0.15.14
release-0.15.13
release-0.15.11
release-0.15.10
release-0.15.9
release-0.15.7
release-0.15.6
release-0.15.5
mpd/0.20.6-alt1
mpd/0.19.9-alt1
mpd/0.18.14-alt2
gb-sisyphus-task339776.6100
gb-sisyphus-task337393.100
gb-sisyphus-task337176.300
gb-sisyphus-task334590.100
gb-sisyphus-task333607.100
gb-sisyphus-task331543.2500
gb-sisyphus-task328663.4700
gb-sisyphus-task325064.100
gb-sisyphus-task319111.4000
gb-sisyphus-task313704.100
gb-sisyphus-task312885.100
gb-sisyphus-task308905.3200
gb-sisyphus-task305294.500
gb-sisyphus-task304007.100
gb-sisyphus-task303674.1700
gb-sisyphus-task298681.300
gb-sisyphus-task296051.1000
gb-sisyphus-task274827.100
gb-sisyphus-task269249.2000
gb-sisyphus-task266579.400
gb-sisyphus-task258132.600
gb-sisyphus-task254601.200
gb-sisyphus-task253310.100
gb-sisyphus-task252214.300
gb-sisyphus-task251539.6100
gb-sisyphus-task247988.7000
gb-sisyphus-task238768.6000
gb-sisyphus-task229151.100
gb-sisyphus-task227574.200
gb-sisyphus-task226762.6000
gb-sisyphus-task219546.1700
gb-sisyphus-task213491.100
gb-sisyphus-task198806.100
gb-sisyphus-task181400.100
gb-sisyphus-task141957.100
gb-sisyphus-task135039.100
gb-sisyphus-task130102.100
gb-sisyphus-task129023.100
gb-sisyphus-task127959.100
gb-sisyphus-task118591.100
gb-p9-task277538.2600
gb-c9f2-task327704.1100
fixed-0.17.0-git200911
alt-0.17.0-git200711
alt-0.17.0-git050212
alt-0.16.2
No related merge requests found
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)
while
(
true
)
{
ret
=
input_stream_read
(
base
->
input
,
(
void
*
)
buf
,
size
);
if
(
ret
==
0
)
{
DEBUG
(
"ret 0
\n
"
);
if
(
input_stream_eof
(
base
->
input
)
||
(
base
->
decoder
&&
decoder_get_command
(
base
->
decoder
)
!=
DECODE_COMMAND_NONE
))
{
DEBUG
(
"eof stream
\n
"
);
decoder_get_command
(
base
->
decoder
)
!=
DECODE_COMMAND_NONE
))
return
ret
;
}
else
{
else
my_usleep
(
10000
);
}
}
else
{
break
;
}
...
...
@@ -201,10 +198,8 @@ ffmpeg_helper(struct input_stream *input, int (*callback)(BasePtrs *ptrs),
ptrs
->
aCodec
=
aCodec
;
ret
=
(
*
callback
)(
ptrs
);
}
else
{
}
else
ret
=
0
;
DEBUG
(
"playable
\n
"
);
}
avcodec_close
(
aCodecCtx
);
av_close_input_file
(
pFormatCtx
);
...
...
@@ -238,8 +233,6 @@ static int ffmpeg_decode_internal(BasePtrs *base)
total_time
=
0
;
DEBUG
(
"decoder_start
\n
"
);
if
(
aCodecCtx
->
channels
>
2
)
{
aCodecCtx
->
channels
=
2
;
}
...
...
@@ -248,29 +241,18 @@ static int ffmpeg_decode_internal(BasePtrs *base)
audio_format
.
sample_rate
=
(
unsigned
int
)
aCodecCtx
->
sample_rate
;
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)
if
(
pFormatCtx
->
duration
!=
(
int
)
AV_NOPTS_VALUE
)
{
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
);
position
=
0
;
DEBUG
(
"duration:%d (%d secs)
\n
"
,
(
int
)
pFormatCtx
->
duration
,
(
int
)
total_time
);
do
{
if
(
decoder_get_command
(
decoder
)
==
DECODE_COMMAND_SEEK
)
{
DEBUG
(
"seek
\n
"
);
current
=
decoder_seek_where
(
decoder
)
*
AV_TIME_BASE
;
if
(
av_seek_frame
(
pFormatCtx
,
-
1
,
current
,
0
)
<
0
)
{
...
...
@@ -294,15 +276,11 @@ static int ffmpeg_decode_internal(BasePtrs *base)
packet
.
size
);
if
(
len
>=
0
)
{
if
(
audio_size
>=
0
)
{
// DEBUG("sending data %d/%d\n", audio_size, len);
if
(
audio_size
>=
0
)
decoder_data
(
decoder
,
NULL
,
1
,
audio_buf
,
audio_size
,
position
,
//(float)current / (float)audio_format.sample_rate,
aCodecCtx
->
bit_rate
/
1000
,
NULL
);
}
}
else
{
WARNING
(
"skiping frame!
\n
"
);
}
...
...
@@ -314,7 +292,6 @@ static int ffmpeg_decode_internal(BasePtrs *base)
}
}
while
(
decoder_get_command
(
decoder
)
!=
DECODE_COMMAND_STOP
);
DEBUG
(
"decoder finish
\n
"
);
return
0
;
}
...
...
@@ -322,18 +299,11 @@ static bool
ffmpeg_decode
(
struct
decoder
*
decoder
,
struct
input_stream
*
input
)
{
BasePtrs
base
;
bool
ret
;
DEBUG
(
"decode start
\n
"
);
base
.
input
=
input
;
base
.
decoder
=
decoder
;
ret
=
ffmpeg_helper
(
input
,
ffmpeg_decode_internal
,
&
base
)
==
0
;
DEBUG
(
"decode finish
\n
"
);
return
ret
;
return
ffmpeg_helper
(
input
,
ffmpeg_decode_internal
,
&
base
)
==
0
;
}
static
int
ffmpeg_tag_internal
(
BasePtrs
*
base
)
...
...
This diff is collapsed.
Click to expand it.
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