Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
3f75e511
Commit
3f75e511
authored
Dec 06, 2016
by
Luca Barbato
Committed by
Vittorio Giovara
Dec 08, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avio: Keep track of the amount of data written
Make avio_size() work with any write AVIOContext.
parent
fc85646a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
avio.h
libavformat/avio.h
+1
-0
aviobuf.c
libavformat/aviobuf.c
+10
-3
version.h
libavformat/version.h
+1
-1
No files found.
libavformat/avio.h
View file @
3f75e511
...
...
@@ -176,6 +176,7 @@ typedef struct AVIOContext {
*/
enum
AVIODataMarkerType
current_type
;
int64_t
last_time
;
int64_t
written
;
}
AVIOContext
;
/**
...
...
libavformat/aviobuf.c
View file @
3f75e511
...
...
@@ -168,18 +168,22 @@ AVIOContext *avio_alloc_context(
static
void
flush_buffer
(
AVIOContext
*
s
)
{
if
(
s
->
buf_ptr
>
s
->
buffer
)
{
int
size
=
s
->
buf_ptr
-
s
->
buffer
;
if
(
!
s
->
error
)
{
int
ret
=
0
;
if
(
s
->
write_data_type
)
ret
=
s
->
write_data_type
(
s
->
opaque
,
s
->
buffer
,
s
->
buf_ptr
-
s
->
buffer
,
s
ize
,
s
->
current_type
,
s
->
last_time
);
else
if
(
s
->
write_packet
)
ret
=
s
->
write_packet
(
s
->
opaque
,
s
->
buffer
,
s
->
buf_ptr
-
s
->
buffer
);
s
ize
);
if
(
ret
<
0
)
{
s
->
error
=
ret
;
}
else
{
if
(
s
->
pos
+
size
>
s
->
written
)
s
->
written
=
s
->
pos
+
size
;
}
}
if
(
s
->
current_type
==
AVIO_DATA_MARKER_SYNC_POINT
||
...
...
@@ -192,7 +196,7 @@ static void flush_buffer(AVIOContext *s)
s
->
buf_ptr
-
s
->
checksum_ptr
);
s
->
checksum_ptr
=
s
->
buffer
;
}
s
->
pos
+=
s
->
buf_ptr
-
s
->
buffer
;
s
->
pos
+=
s
ize
;
}
s
->
buf_ptr
=
s
->
buffer
;
}
...
...
@@ -301,6 +305,9 @@ int64_t avio_size(AVIOContext *s)
if
(
!
s
)
return
AVERROR
(
EINVAL
);
if
(
s
->
written
)
return
s
->
written
;
if
(
!
s
->
seek
)
return
AVERROR
(
ENOSYS
);
size
=
s
->
seek
(
s
->
opaque
,
0
,
AVSEEK_SIZE
);
...
...
libavformat/version.h
View file @
3f75e511
...
...
@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 10
#define LIBAVFORMAT_VERSION_MICRO
1
#define LIBAVFORMAT_VERSION_MICRO
2
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
...
...
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