diff options
| author | angiebird <angiebird@google.com> | 2019-11-02 22:13:58 -0700 |
|---|---|---|
| committer | angiebird <angiebird@google.com> | 2019-11-14 18:10:44 -0800 |
| commit | 71684703aa6e85f4b8f77c9cfcb4886abbcd5522 (patch) | |
| tree | f8199daa7bcc2409954ddb3f7799e8cbbb674909 /vp9/encoder | |
| parent | 76cdfe2d732188847002d4bcbde3ed0964d77bb0 (diff) | |
| download | libvpx-71684703aa6e85f4b8f77c9cfcb4886abbcd5522.tar libvpx-71684703aa6e85f4b8f77c9cfcb4886abbcd5522.tar.gz libvpx-71684703aa6e85f4b8f77c9cfcb4886abbcd5522.tar.bz2 libvpx-71684703aa6e85f4b8f77c9cfcb4886abbcd5522.zip | |
Remove output_pkt_list from cpi
Move the pkt operations to encoder_encode
Change-Id: Ibe730baab61bf7a395998641f106eb0f06d3b8ae
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 6 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encoder.h | 1 | ||||
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 15 |
3 files changed, 5 insertions, 17 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index d5a58d9c8..75ce37eae 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -7187,12 +7187,6 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, *frame_flags = (source->flags & VPX_EFLAG_FORCE_KF) ? FRAMEFLAGS_KEY : 0; } else { *size = 0; -#if !CONFIG_REALTIME_ONLY - if (flush && oxcf->pass == 1 && !cpi->twopass.first_pass_done) { - vp9_end_first_pass(cpi); /* get last stats packet */ - cpi->twopass.first_pass_done = 1; - } -#endif // !CONFIG_REALTIME_ONLY return -1; } diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index d603ce62a..2a7facaea 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -264,7 +264,6 @@ typedef struct VP9EncoderConfig { unsigned int target_level; vpx_fixed_buf_t two_pass_stats_in; - struct vpx_codec_pkt_list *output_pkt_list; #if CONFIG_FP_MB_STATS vpx_fixed_buf_t firstpass_mb_stats_in; diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index ee2294ff7..a1bbd4e77 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -84,14 +84,8 @@ static int input_stats(TWO_PASS *p, FIRSTPASS_STATS *fps) { return 1; } -static void output_stats(FIRSTPASS_STATS *stats, - struct vpx_codec_pkt_list *pktlist) { - struct vpx_codec_cx_pkt pkt; - pkt.kind = VPX_CODEC_STATS_PKT; - pkt.data.twopass_stats.buf = stats; - pkt.data.twopass_stats.sz = sizeof(FIRSTPASS_STATS); - vpx_codec_pkt_list_add(pktlist, &pkt); - +static void output_stats(FIRSTPASS_STATS *stats) { + (void)stats; // TEMP debug code #if OUTPUT_FPF { @@ -319,7 +313,8 @@ void vp9_init_first_pass(VP9_COMP *cpi) { } void vp9_end_first_pass(VP9_COMP *cpi) { - output_stats(&cpi->twopass.total_stats, cpi->output_pkt_list); + output_stats(&cpi->twopass.total_stats); + cpi->twopass.first_pass_done = 1; vpx_free(cpi->twopass.fp_mb_float_stats); cpi->twopass.fp_mb_float_stats = NULL; } @@ -1428,7 +1423,7 @@ void vp9_first_pass(VP9_COMP *cpi, const struct lookahead_entry *source) { // Don't want to do output stats with a stack variable! twopass->this_frame_stats = fps; - output_stats(&twopass->this_frame_stats, cpi->output_pkt_list); + output_stats(&twopass->this_frame_stats); accumulate_stats(&twopass->total_stats, &fps); #if CONFIG_FP_MB_STATS |