Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
733996f4
Commit
733996f4
authored
Nov 12, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed output bitrate value + cosmetics.
parent
940c7979
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
modules/codec/dirac.c
modules/codec/dirac.c
+6
-5
No files found.
modules/codec/dirac.c
View file @
733996f4
...
@@ -549,6 +549,7 @@ static int OpenEncoder( vlc_object_t *p_this )
...
@@ -549,6 +549,7 @@ static int OpenEncoder( vlc_object_t *p_this )
i_tmp
=
var_GetInteger
(
p_enc
,
ENC_CFG_PREFIX
ENC_TARGETRATE
);
i_tmp
=
var_GetInteger
(
p_enc
,
ENC_CFG_PREFIX
ENC_TARGETRATE
);
if
(
i_tmp
>
-
1
)
if
(
i_tmp
>
-
1
)
p_sys
->
ctx
.
enc_params
.
trate
=
i_tmp
;
p_sys
->
ctx
.
enc_params
.
trate
=
i_tmp
;
p_enc
->
fmt_out
.
i_bitrate
=
p_sys
->
ctx
.
enc_params
.
trate
*
1000
;
p_sys
->
ctx
.
enc_params
.
lossless
=
var_GetBool
(
p_enc
,
ENC_CFG_PREFIX
ENC_LOSSLESS
);
p_sys
->
ctx
.
enc_params
.
lossless
=
var_GetBool
(
p_enc
,
ENC_CFG_PREFIX
ENC_LOSSLESS
);
...
@@ -589,14 +590,14 @@ static int OpenEncoder( vlc_object_t *p_this )
...
@@ -589,14 +590,14 @@ static int OpenEncoder( vlc_object_t *p_this )
if
(
!
psz_tmp
)
if
(
!
psz_tmp
)
goto
error
;
goto
error
;
else
if
(
!
strcmp
(
psz_tmp
,
"auto"
)
)
{
else
if
(
!
strcmp
(
psz_tmp
,
"auto"
)
)
{
p_sys
->
b_auto_field_coding
=
1
;
p_sys
->
b_auto_field_coding
=
true
;
}
}
else
if
(
!
strcmp
(
psz_tmp
,
"progressive"
)
)
{
else
if
(
!
strcmp
(
psz_tmp
,
"progressive"
)
)
{
p_sys
->
b_auto_field_coding
=
0
;
p_sys
->
b_auto_field_coding
=
false
;
p_sys
->
ctx
.
enc_params
.
picture_coding_mode
=
0
;
p_sys
->
ctx
.
enc_params
.
picture_coding_mode
=
0
;
}
}
else
if
(
!
strcmp
(
psz_tmp
,
"field"
)
)
{
else
if
(
!
strcmp
(
psz_tmp
,
"field"
)
)
{
p_sys
->
b_auto_field_coding
=
0
;
p_sys
->
b_auto_field_coding
=
false
;
p_sys
->
ctx
.
enc_params
.
picture_coding_mode
=
1
;
p_sys
->
ctx
.
enc_params
.
picture_coding_mode
=
1
;
}
}
else
{
else
{
...
@@ -734,7 +735,7 @@ static int OpenEncoder( vlc_object_t *p_this )
...
@@ -734,7 +735,7 @@ static int OpenEncoder( vlc_object_t *p_this )
/* Set up output buffer */
/* Set up output buffer */
/* Unfortunately it isn't possible to determine if the buffer
/* Unfortunately it isn't possible to determine if the buffer
* is too small (and then reallocate it) */
* is too small (and then reallocate it) */
p_sys
->
i_buffer_out
=
p_sys
->
i_buffer_in
;
p_sys
->
i_buffer_out
=
4096
+
p_sys
->
i_buffer_in
;
if
(
(
p_sys
->
p_buffer_out
=
malloc
(
p_sys
->
i_buffer_out
)
)
==
NULL
)
if
(
(
p_sys
->
p_buffer_out
=
malloc
(
p_sys
->
i_buffer_out
)
)
==
NULL
)
{
{
CloseEncoder
(
p_this
);
CloseEncoder
(
p_this
);
...
@@ -763,7 +764,7 @@ static int ReadDiracPictureNumber( uint32_t *p_picnum, block_t *p_block )
...
@@ -763,7 +764,7 @@ static int ReadDiracPictureNumber( uint32_t *p_picnum, block_t *p_block )
/* skip to the next dirac data unit */
/* skip to the next dirac data unit */
uint32_t
u_npo
=
GetDWBE
(
p_block
->
p_buffer
+
u_pos
+
1
);
uint32_t
u_npo
=
GetDWBE
(
p_block
->
p_buffer
+
u_pos
+
1
);
assert
(
u_npo
<=
UINT32_MAX
-
u_pos
);
assert
(
u_npo
<=
UINT32_MAX
-
u_pos
);
if
(
u_npo
==
0
)
if
(
u_npo
==
0
)
u_npo
=
13
;
u_npo
=
13
;
u_pos
+=
u_npo
;
u_pos
+=
u_npo
;
}
}
...
...
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