Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
3886572a
Commit
3886572a
authored
11 years ago
by
Marton Balint
Browse files
Options
Downloads
Patches
Plain Diff
ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
aa74810f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ffplay.c
+8
-5
8 additions, 5 deletions
ffplay.c
with
8 additions
and
5 deletions
ffplay.c
+
8
−
5
View file @
3886572a
...
@@ -2297,10 +2297,11 @@ static int audio_decode_frame(VideoState *is)
...
@@ -2297,10 +2297,11 @@ static int audio_decode_frame(VideoState *is)
audio_clock0
=
is
->
audio_clock
;
audio_clock0
=
is
->
audio_clock
;
/* update the audio clock with the pts */
/* update the audio clock with the pts */
if
(
is
->
frame
->
pts
!=
AV_NOPTS_VALUE
)
{
if
(
is
->
frame
->
pts
!=
AV_NOPTS_VALUE
)
is
->
audio_clock
=
is
->
frame
->
pts
*
av_q2d
(
tb
)
+
(
double
)
is
->
frame
->
nb_samples
/
is
->
frame
->
sample_rate
;
is
->
audio_clock
=
is
->
frame
->
pts
*
av_q2d
(
tb
)
+
(
double
)
is
->
frame
->
nb_samples
/
is
->
frame
->
sample_rate
;
is
->
audio_clock_serial
=
is
->
audio_pkt_temp_serial
;
else
}
is
->
audio_clock
=
NAN
;
is
->
audio_clock_serial
=
is
->
audio_pkt_temp_serial
;
#ifdef DEBUG
#ifdef DEBUG
{
{
static
double
last_clock
;
static
double
last_clock
;
...
@@ -2374,8 +2375,10 @@ static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
...
@@ -2374,8 +2375,10 @@ static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
bytes_per_sec
=
is
->
audio_tgt
.
freq
*
is
->
audio_tgt
.
channels
*
av_get_bytes_per_sample
(
is
->
audio_tgt
.
fmt
);
bytes_per_sec
=
is
->
audio_tgt
.
freq
*
is
->
audio_tgt
.
channels
*
av_get_bytes_per_sample
(
is
->
audio_tgt
.
fmt
);
is
->
audio_write_buf_size
=
is
->
audio_buf_size
-
is
->
audio_buf_index
;
is
->
audio_write_buf_size
=
is
->
audio_buf_size
-
is
->
audio_buf_index
;
/* Let's assume the audio driver that is used by SDL has two periods. */
/* Let's assume the audio driver that is used by SDL has two periods. */
set_clock_at
(
&
is
->
audclk
,
is
->
audio_clock
-
(
double
)(
2
*
is
->
audio_hw_buf_size
+
is
->
audio_write_buf_size
)
/
bytes_per_sec
,
is
->
audio_clock_serial
,
audio_callback_time
/
1000000
.
0
);
if
(
!
isnan
(
is
->
audio_clock
))
{
sync_clock_to_slave
(
&
is
->
extclk
,
&
is
->
audclk
);
set_clock_at
(
&
is
->
audclk
,
is
->
audio_clock
-
(
double
)(
2
*
is
->
audio_hw_buf_size
+
is
->
audio_write_buf_size
)
/
bytes_per_sec
,
is
->
audio_clock_serial
,
audio_callback_time
/
1000000
.
0
);
sync_clock_to_slave
(
&
is
->
extclk
,
&
is
->
audclk
);
}
}
}
static
int
audio_open
(
void
*
opaque
,
int64_t
wanted_channel_layout
,
int
wanted_nb_channels
,
int
wanted_sample_rate
,
struct
AudioParams
*
audio_hw_params
)
static
int
audio_open
(
void
*
opaque
,
int64_t
wanted_channel_layout
,
int
wanted_nb_channels
,
int
wanted_sample_rate
,
struct
AudioParams
*
audio_hw_params
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment