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
e83c2dde
Commit
e83c2dde
authored
Oct 05, 2011
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix 'heigth' vs. 'height' typos.
parent
a4ea00d0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
15 deletions
+15
-15
filters.texi
doc/filters.texi
+7
-7
dnxhddec.c
libavcodec/dnxhddec.c
+1
-1
fbdev.c
libavdevice/fbdev.c
+7
-7
No files found.
doc/filters.texi
View file @
e83c2dde
...
...
@@ -204,13 +204,13 @@ the computed values for @var{x} and @var{y}. They are evaluated for
each new frame.
@item in_w, in_h
the input width and heig
th
the input width and heig
ht
@item iw, ih
same as @var{in_w} and @var{in_h}
@item out_w, out_h
the output (cropped) width and heig
th
the output (cropped) width and heig
ht
@item ow, oh
same as @var{out_w} and @var{out_h}
...
...
@@ -895,13 +895,13 @@ the corresponding mathematical approximated values for e
(euler number), pi (greek PI), phi (golden ratio)
@item in_w, in_h
the input video width and heig
th
the input video width and heig
ht
@item iw, ih
same as @var{in_w} and @var{in_h}
@item out_w, out_h
the output width and heig
th
, that is the size of the padded area as
the output width and heig
ht
, that is the size of the padded area as
specified by the @var{width} and @var{height} expressions
@item ow, oh
...
...
@@ -1002,13 +1002,13 @@ the corresponding mathematical approximated values for e
(euler number), pi (greek PI), phi (golden ratio)
@item in_w, in_h
the input width and heig
th
the input width and heig
ht
@item iw, ih
same as @var{in_w} and @var{in_h}
@item out_w, out_h
the output (cropped) width and heig
th
the output (cropped) width and heig
ht
@item ow, oh
same as @var{out_w} and @var{out_h}
...
...
@@ -1626,7 +1626,7 @@ alpha specifier. The default value is "black".
@item frame_size
Specify the size of the sourced video, it may be a string of the form
@var{width}x@var{heig
th
}, or the name of a size abbreviation. The
@var{width}x@var{heig
ht
}, or the name of a size abbreviation. The
default value is "320x240".
@item frame_rate
...
...
libavcodec/dnxhddec.c
View file @
e83c2dde
...
...
@@ -115,7 +115,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, const uint8_t *buf, int buf_si
ctx
->
height
=
AV_RB16
(
buf
+
0x18
);
ctx
->
width
=
AV_RB16
(
buf
+
0x1a
);
av_dlog
(
ctx
->
avctx
,
"width %d, heig
th
%d
\n
"
,
ctx
->
width
,
ctx
->
height
);
av_dlog
(
ctx
->
avctx
,
"width %d, heig
ht
%d
\n
"
,
ctx
->
width
,
ctx
->
height
);
if
(
buf
[
0x21
]
&
0x40
)
{
ctx
->
avctx
->
pix_fmt
=
PIX_FMT_YUV422P10
;
...
...
libavdevice/fbdev.c
View file @
e83c2dde
...
...
@@ -84,7 +84,7 @@ typedef struct {
int64_t
time_frame
;
///< time for the next frame to output (in 1/1000000 units)
int
fd
;
///< framebuffer device file descriptor
int
width
,
heig
th
;
///< assumed frame resolution
int
width
,
heig
ht
;
///< assumed frame resolution
int
frame_linesize
;
///< linesize of the output frame, it is assumed to be constant
int
bytes_per_pixel
;
...
...
@@ -147,10 +147,10 @@ av_cold static int fbdev_read_header(AVFormatContext *avctx,
}
fbdev
->
width
=
fbdev
->
varinfo
.
xres
;
fbdev
->
heig
th
=
fbdev
->
varinfo
.
yres
;
fbdev
->
heig
ht
=
fbdev
->
varinfo
.
yres
;
fbdev
->
bytes_per_pixel
=
(
fbdev
->
varinfo
.
bits_per_pixel
+
7
)
>>
3
;
fbdev
->
frame_linesize
=
fbdev
->
width
*
fbdev
->
bytes_per_pixel
;
fbdev
->
frame_size
=
fbdev
->
frame_linesize
*
fbdev
->
heig
th
;
fbdev
->
frame_size
=
fbdev
->
frame_linesize
*
fbdev
->
heig
ht
;
fbdev
->
time_frame
=
AV_NOPTS_VALUE
;
fbdev
->
data
=
mmap
(
NULL
,
fbdev
->
fixinfo
.
smem_len
,
PROT_READ
,
MAP_SHARED
,
fbdev
->
fd
,
0
);
if
(
fbdev
->
data
==
MAP_FAILED
)
{
...
...
@@ -162,15 +162,15 @@ av_cold static int fbdev_read_header(AVFormatContext *avctx,
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
st
->
codec
->
codec_id
=
CODEC_ID_RAWVIDEO
;
st
->
codec
->
width
=
fbdev
->
width
;
st
->
codec
->
height
=
fbdev
->
heig
th
;
st
->
codec
->
height
=
fbdev
->
heig
ht
;
st
->
codec
->
pix_fmt
=
pix_fmt
;
st
->
codec
->
time_base
=
(
AVRational
){
fbdev
->
framerate_q
.
den
,
fbdev
->
framerate_q
.
num
};
st
->
codec
->
bit_rate
=
fbdev
->
width
*
fbdev
->
heig
th
*
fbdev
->
bytes_per_pixel
*
av_q2d
(
fbdev
->
framerate_q
)
*
8
;
fbdev
->
width
*
fbdev
->
heig
ht
*
fbdev
->
bytes_per_pixel
*
av_q2d
(
fbdev
->
framerate_q
)
*
8
;
av_log
(
avctx
,
AV_LOG_INFO
,
"w:%d h:%d bpp:%d pixfmt:%s fps:%d/%d bit_rate:%d
\n
"
,
fbdev
->
width
,
fbdev
->
heig
th
,
fbdev
->
varinfo
.
bits_per_pixel
,
fbdev
->
width
,
fbdev
->
heig
ht
,
fbdev
->
varinfo
.
bits_per_pixel
,
av_pix_fmt_descriptors
[
pix_fmt
].
name
,
fbdev
->
framerate_q
.
num
,
fbdev
->
framerate_q
.
den
,
st
->
codec
->
bit_rate
);
...
...
@@ -224,7 +224,7 @@ static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt)
pout
=
pkt
->
data
;
// TODO it'd be nice if the lines were aligned
for
(
i
=
0
;
i
<
fbdev
->
heig
th
;
i
++
)
{
for
(
i
=
0
;
i
<
fbdev
->
heig
ht
;
i
++
)
{
memcpy
(
pout
,
pin
,
fbdev
->
frame_linesize
);
pin
+=
fbdev
->
fixinfo
.
line_length
;
pout
+=
fbdev
->
frame_linesize
;
...
...
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