Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
6c6c976f
Commit
6c6c976f
authored
Apr 26, 2011
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffplay: Remove disabled code.
parent
e1694285
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
65 deletions
+1
-65
ffplay.c
ffplay.c
+1
-65
No files found.
ffplay.c
View file @
6c6c976f
...
@@ -407,44 +407,6 @@ static inline void fill_rectangle(SDL_Surface *screen,
...
@@ -407,44 +407,6 @@ static inline void fill_rectangle(SDL_Surface *screen,
SDL_FillRect
(
screen
,
&
rect
,
color
);
SDL_FillRect
(
screen
,
&
rect
,
color
);
}
}
#if 0
/* draw only the border of a rectangle */
void fill_border(VideoState *s, int x, int y, int w, int h, int color)
{
int w1, w2, h1, h2;
/* fill the background */
w1 = x;
if (w1 < 0)
w1 = 0;
w2 = s->width - (x + w);
if (w2 < 0)
w2 = 0;
h1 = y;
if (h1 < 0)
h1 = 0;
h2 = s->height - (y + h);
if (h2 < 0)
h2 = 0;
fill_rectangle(screen,
s->xleft, s->ytop,
w1, s->height,
color);
fill_rectangle(screen,
s->xleft + s->width - w2, s->ytop,
w2, s->height,
color);
fill_rectangle(screen,
s->xleft + w1, s->ytop,
s->width - w1 - w2, h1,
color);
fill_rectangle(screen,
s->xleft + w1, s->ytop + s->height - h2,
s->width - w1 - w2, h2,
color);
}
#endif
#define ALPHA_BLEND(a, oldp, newp, s)\
#define ALPHA_BLEND(a, oldp, newp, s)\
((((oldp << s) * (255 - (a))) + (newp * (a))) / (255 << s))
((((oldp << s) * (255 - (a))) + (newp * (a))) / (255 << s))
...
@@ -747,23 +709,12 @@ static void video_image_display(VideoState *is)
...
@@ -747,23 +709,12 @@ static void video_image_display(VideoState *is)
}
}
x
=
(
is
->
width
-
width
)
/
2
;
x
=
(
is
->
width
-
width
)
/
2
;
y
=
(
is
->
height
-
height
)
/
2
;
y
=
(
is
->
height
-
height
)
/
2
;
if
(
!
is
->
no_background
)
{
is
->
no_background
=
0
;
/* fill the background */
// fill_border(is, x, y, width, height, QERGB(0x00, 0x00, 0x00));
}
else
{
is
->
no_background
=
0
;
}
rect
.
x
=
is
->
xleft
+
x
;
rect
.
x
=
is
->
xleft
+
x
;
rect
.
y
=
is
->
ytop
+
y
;
rect
.
y
=
is
->
ytop
+
y
;
rect
.
w
=
width
;
rect
.
w
=
width
;
rect
.
h
=
height
;
rect
.
h
=
height
;
SDL_DisplayYUVOverlay
(
vp
->
bmp
,
&
rect
);
SDL_DisplayYUVOverlay
(
vp
->
bmp
,
&
rect
);
}
else
{
#if 0
fill_rectangle(screen,
is->xleft, is->ytop, is->width, is->height,
QERGB(0x00, 0x00, 0x00));
#endif
}
}
}
}
...
@@ -1503,10 +1454,6 @@ static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1, int6
...
@@ -1503,10 +1454,6 @@ static int output_picture2(VideoState *is, AVFrame *src_frame, double pts1, int6
frame_delay
+=
src_frame
->
repeat_pict
*
(
frame_delay
*
0
.
5
);
frame_delay
+=
src_frame
->
repeat_pict
*
(
frame_delay
*
0
.
5
);
is
->
video_clock
+=
frame_delay
;
is
->
video_clock
+=
frame_delay
;
#if defined(DEBUG_SYNC) && 0
printf
(
"frame_type=%c clock=%0.3f pts=%0.3f
\n
"
,
av_get_picture_type_char
(
src_frame
->
pict_type
),
pts
,
pts1
);
#endif
return
queue_picture
(
is
,
src_frame
,
pts
,
pos
);
return
queue_picture
(
is
,
src_frame
,
pts
,
pos
);
}
}
...
@@ -1920,8 +1867,6 @@ static int subtitle_thread(void *arg)
...
@@ -1920,8 +1867,6 @@ static int subtitle_thread(void *arg)
len1
=
avcodec_decode_subtitle2
(
is
->
subtitle_st
->
codec
,
len1
=
avcodec_decode_subtitle2
(
is
->
subtitle_st
->
codec
,
&
sp
->
sub
,
&
got_subtitle
,
&
sp
->
sub
,
&
got_subtitle
,
pkt
);
pkt
);
// if (len1 < 0)
// break;
if
(
got_subtitle
&&
sp
->
sub
.
format
==
0
)
{
if
(
got_subtitle
&&
sp
->
sub
.
format
==
0
)
{
sp
->
pts
=
pts
;
sp
->
pts
=
pts
;
...
@@ -1945,9 +1890,6 @@ static int subtitle_thread(void *arg)
...
@@ -1945,9 +1890,6 @@ static int subtitle_thread(void *arg)
SDL_UnlockMutex
(
is
->
subpq_mutex
);
SDL_UnlockMutex
(
is
->
subpq_mutex
);
}
}
av_free_packet
(
pkt
);
av_free_packet
(
pkt
);
// if (step)
// if (cur_stream)
// stream_pause(cur_stream);
}
}
the_end:
the_end:
return
0
;
return
0
;
...
@@ -2270,8 +2212,6 @@ static int stream_component_open(VideoState *is, int stream_index)
...
@@ -2270,8 +2212,6 @@ static int stream_component_open(VideoState *is, int stream_index)
is
->
video_stream
=
stream_index
;
is
->
video_stream
=
stream_index
;
is
->
video_st
=
ic
->
streams
[
stream_index
];
is
->
video_st
=
ic
->
streams
[
stream_index
];
// is->video_current_pts_time = av_gettime();
packet_queue_init
(
&
is
->
videoq
);
packet_queue_init
(
&
is
->
videoq
);
is
->
video_tid
=
SDL_CreateThread
(
video_thread
,
is
);
is
->
video_tid
=
SDL_CreateThread
(
video_thread
,
is
);
break
;
break
;
...
@@ -2718,10 +2658,6 @@ static void stream_cycle_channel(VideoState *is, int codec_type)
...
@@ -2718,10 +2658,6 @@ static void stream_cycle_channel(VideoState *is, int codec_type)
static
void
toggle_full_screen
(
void
)
static
void
toggle_full_screen
(
void
)
{
{
is_full_screen
=
!
is_full_screen
;
is_full_screen
=
!
is_full_screen
;
if
(
!
fs_screen_width
)
{
/* use default SDL method */
// SDL_WM_ToggleFullScreen(screen);
}
video_open
(
cur_stream
);
video_open
(
cur_stream
);
}
}
...
...
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