Commit e8a74f4b authored by Tom Finegan's avatar Tom Finegan Committed by Gerrit Code Review
Browse files

Merge "examples/simple_decoder: Correct comments/remove unnecessary include."

parents b1b6fd85 c9527aa6
Branches
Tags
No related merge requests found
Showing with 13 additions and 13 deletions
...@@ -33,24 +33,25 @@ ...@@ -33,24 +33,25 @@
// //
// Initializing The Codec // Initializing The Codec
// ---------------------- // ----------------------
// The decoder is initialized by the following code. This is an example for // The libvpx decoder is initialized by the call to vpx_codec_dec_init().
// the VP8 decoder, but the code is analogous for all algorithms. Replace // Determining the codec interface to use is handled by VpxVideoReader and the
// `vpx_codec_vp8_dx()` with a pointer to the interface exposed by the // functions prefixed with vpx_video_reader_. Discussion of those functions is
// algorithm you want to use. The `cfg` argument is left as NULL in this // beyond the scope of this example, but the main gist is to open the input file
// example, because we want the algorithm to determine the stream // and parse just enough of it to determine if it's a VPx file and which VPx
// configuration (width/height) and allocate memory automatically. This // codec is contained within the file.
// parameter is generally only used if you need to preallocate memory, // Note the NULL pointer passed to vpx_codec_dec_init(). We do that in this
// particularly in External Memory Allocation mode. // example because we want the algorithm to determine the stream configuration
// (width/height) and allocate memory automatically.
// //
// Decoding A Frame // Decoding A Frame
// ---------------- // ----------------
// Once the frame has been read into memory, it is decoded using the // Once the frame has been read into memory, it is decoded using the
// `vpx_codec_decode` function. The call takes a pointer to the data // `vpx_codec_decode` function. The call takes a pointer to the data
// (`frame`) and the length of the data (`frame_sz`). No application data // (`frame`) and the length of the data (`frame_size`). No application data
// is associated with the frame in this example, so the `user_priv` // is associated with the frame in this example, so the `user_priv`
// parameter is NULL. The `deadline` parameter is left at zero for this // parameter is NULL. The `deadline` parameter is left at zero for this
// example. This parameter is generally only used when doing adaptive // example. This parameter is generally only used when doing adaptive post
// postprocessing. // processing.
// //
// Codecs may produce a variable number of output frames for every call to // Codecs may produce a variable number of output frames for every call to
// `vpx_codec_decode`. These frames are retrieved by the // `vpx_codec_decode`. These frames are retrieved by the
...@@ -72,14 +73,13 @@ ...@@ -72,14 +73,13 @@
// -------------- // --------------
// This example does not special case any error return codes. If there was // This example does not special case any error return codes. If there was
// an error, a descriptive message is printed and the program exits. With // an error, a descriptive message is printed and the program exits. With
// few exeptions, vpx_codec functions return an enumerated error status, // few exceptions, vpx_codec functions return an enumerated error status,
// with the value `0` indicating success. // with the value `0` indicating success.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "vpx/vp8dx.h"
#include "vpx/vpx_decoder.h" #include "vpx/vpx_decoder.h"
#include "./tools_common.h" #include "./tools_common.h"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment