ref: b92eb54106ed923885b8e2223575b791cb12fe6a
parent: 096b44f43b15ff47da48b28d531411a4c831bd84
author: Vignesh Venkatasubramanian <vigneshv@google.com>
date: Mon Apr 14 11:21:22 EDT 2014
webmdec: Fix return values for webm_read_frame Fix return values for webm_read_frame so that we can distinguish between error and end of stream. 0 - Success, 1 - End of stream, -1 error. Change-Id: Ic35d0c7d7a166e027711a3d2300ecdda25a5d0cc
--- a/webmdec.c
+++ b/webmdec.c
@@ -114,6 +114,7 @@
size_t *buffer_size) {
if (webm_ctx->chunk >= webm_ctx->chunks) {
uint32_t track;
+ int status;
do {
/* End of this packet, get another. */
@@ -122,14 +123,16 @@
webm_ctx->pkt = NULL;
}
- if (nestegg_read_packet(webm_ctx->nestegg_ctx, &webm_ctx->pkt) <= 0 ||
- nestegg_packet_track(webm_ctx->pkt, &track)) {
- return 1;
- }
+ status = nestegg_read_packet(webm_ctx->nestegg_ctx, &webm_ctx->pkt);
+ if (status <= 0)
+ return status ? status : 1;
+
+ if (nestegg_packet_track(webm_ctx->pkt, &track))
+ return -1;
} while (track != webm_ctx->video_track);
if (nestegg_packet_count(webm_ctx->pkt, &webm_ctx->chunks))
- return 1;
+ return -1;
webm_ctx->chunk = 0;
}
@@ -136,7 +139,7 @@
if (nestegg_packet_data(webm_ctx->pkt, webm_ctx->chunk,
buffer, bytes_in_buffer)) {
- return 1;
+ return -1;
}
webm_ctx->chunk++;
--- a/webmdec.h
+++ b/webmdec.h
@@ -31,6 +31,11 @@
int file_is_webm(struct WebmInputContext *webm_ctx,
struct VpxInputContext *vpx_ctx);
+/* Reads a WebM video frame. Return values:
+ * 0 - Success
+ * 1 - End of File
+ * -1 - Error
+ */
int webm_read_frame(struct WebmInputContext *webm_ctx,
uint8_t **buffer,
size_t *bytes_in_buffer,
--
⑨