Re: [FFmpeg-devel] [PATCH v2] examples/decode_video: flush parser to fix missing frame

[Zhao Zhili]

Ping for review.

&gt; On Sep 24, 2020, at 2:01 AM, Zhao Zhili <quinkbl...@foxmail.com&gt; wrote:
&gt; 
&gt; To reproduce, run decode_video with a single frame sample. No frame
&gt; was decoded before the patch.
&gt; ---
&gt; doc/examples/decode_video.c | 12 +++++++-----
&gt; 1 file changed, 7 insertions(+), 5 deletions(-)
&gt; 
&gt; diff --git a/doc/examples/decode_video.c b/doc/examples/decode_video.c
&gt; index 18ee90a6c0..9ce3531d63 100644
&gt; --- a/doc/examples/decode_video.c
&gt; +++ b/doc/examples/decode_video.c
&gt; @@ -92,6 +92,7 @@ int main(int argc, char **argv)
&gt;&nbsp;&nbsp;&nbsp;&nbsp; uint8_t *data;
&gt;&nbsp;&nbsp;&nbsp;&nbsp; size_t&nbsp;&nbsp; data_size;
&gt;&nbsp;&nbsp;&nbsp;&nbsp; int ret;
&gt; +&nbsp;&nbsp;&nbsp; int eof;
&gt;&nbsp;&nbsp;&nbsp;&nbsp; AVPacket *pkt;
&gt; 
&gt;&nbsp;&nbsp;&nbsp;&nbsp; if (argc <= 2) {
&gt; @@ -150,15 +151,14 @@ int main(int argc, char **argv)
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; exit(1);
&gt;&nbsp;&nbsp;&nbsp;&nbsp; }
&gt; 
&gt; -&nbsp;&nbsp;&nbsp; while (!feof(f)) {
&gt; +&nbsp;&nbsp;&nbsp; do {
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* read raw data from the 
input file */
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; data_size = fread(inbuf, 
1, INBUF_SIZE, f);
&gt; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (!data_size)
&gt; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; break;
&gt; +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; eof = !data_size;
&gt; 
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* use the parser to split 
the data into frames */
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; data = inbuf;
&gt; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; while (data_size &gt; 0) {
&gt; +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; while (data_size &gt; 0 || 
eof) {
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
ret = av_parser_parse2(parser, c, &amp;pkt-&gt;data, &amp;pkt-&gt;size,
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 data, data_size, AV_NOPTS_VALUE, AV_NOPTS_VALUE, 0);
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if 
(ret < 0) {
&gt; @@ -170,8 +170,10 @@ int main(int argc, char **argv)
&gt; 
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if 
(pkt-&gt;size)
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 decode(c, frame, pkt, outfilename);
&gt; +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; else 
if (eof)
&gt; 
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 break;
&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
&gt; -&nbsp;&nbsp;&nbsp; }
&gt; +&nbsp;&nbsp;&nbsp; } while (!eof);
&gt; 
&gt;&nbsp;&nbsp;&nbsp;&nbsp; /* flush the decoder */
&gt;&nbsp;&nbsp;&nbsp;&nbsp; decode(c, frame, NULL, outfilename);
&gt; -- 
&gt; 2.25.1
&gt; 
&gt; _______________________________________________
&gt; ffmpeg-devel mailing list
&gt; ffmpeg-devel@ffmpeg.org
&gt; https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
&gt; 
&gt; To unsubscribe, visit link above, or email
&gt; ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".