zoneminder/src/zm_videostore.cpp

// ZoneMinder Video Storage Implementation
// Written by Chris Wiggins
// http://chriswiggins.co.nz
// Modification by Steve Gilvarry
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
//

#define __STDC_FORMAT_MACROS 1

#include <inttypes.h>
#include <stdlib.h>
#include <string.h>

#include "zm.h"
#include "zm_videostore.h"

extern "C" {
#include "libavutil/time.h"
}

VideoStore::VideoStore(
    const char *filename_in,
    const char *format_in,
    AVStream *p_video_in_stream,
    AVStream *p_audio_in_stream,
    Monitor *monitor
    ) {
  video_in_stream = p_video_in_stream;
  audio_in_stream = p_audio_in_stream;
  filename = filename_in;
  format = format_in;

  av_register_all();
  packets_written = 0;
  frame_count = 0;

  Info("Opening video storage stream %s format: %s", filename, format);

  ret = avformat_alloc_output_context2(&oc, NULL, NULL, filename);
  if ( ret < 0 ) {
    Warning(
        "Could not create video storage stream %s as no out ctx"
        " could be assigned based on filename: %s",
        filename, av_make_error_string(ret).c_str());
  } else {
    Debug(4, "Success allocating out format ctx");
  }

  // Couldn't deduce format from filename, trying from format name
  if ( !oc ) {
    avformat_alloc_output_context2(&oc, NULL, format, filename);
    if (!oc) {
      Fatal(
          "Could not create video storage stream %s as no out ctx"
          " could not be assigned based on filename or format %s",
          filename, format);
    } else {
      Debug(4, "Success alocating out ctx");
    }
  }  // end if ! oc
  Debug(2, "Success opening output contect");

  AVDictionary *pmetadata = NULL;
  int dsr = av_dict_set(&pmetadata, "title", "Zoneminder Security Recording", 0);
  if (dsr < 0) Warning("%s:%d: title set failed", __FILE__, __LINE__);
  Debug(2, "Success setting up dictcontect");

  oc->metadata = pmetadata;
  out_format = oc->oformat;
  in_frame = NULL;

  if ( video_in_stream ) {
    video_in_stream_index = video_in_stream->index;
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
    video_in_ctx = avcodec_alloc_context3(NULL);
    Debug(2, "copy to context");
    avcodec_parameters_to_context(video_in_ctx,
        video_in_stream->codecpar);
    Debug(2, "dump to context");
    zm_dump_codecpar( video_in_stream->codecpar );
//video_in_ctx.codec_id = video_in_stream->codecpar.codec_id;
#else
    video_in_ctx = video_in_stream->codec;
Debug(2,"Copied video context from input stream");
      zm_dump_codec(video_in_ctx);
#endif
    // Fix deprecated formats
    switch ( video_in_ctx->pix_fmt ) {
      case AV_PIX_FMT_YUVJ420P :
        video_in_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
        break;
      case AV_PIX_FMT_YUVJ422P  :
        video_in_ctx->pix_fmt = AV_PIX_FMT_YUV422P;
        break;
      case AV_PIX_FMT_YUVJ444P   :
        video_in_ctx->pix_fmt = AV_PIX_FMT_YUV444P;
        break;
      case AV_PIX_FMT_YUVJ440P :
        video_in_ctx->pix_fmt = AV_PIX_FMT_YUV440P;
        break;
      default:
        break;
    }
  } else {
    Debug(2, "No input ctx");
    video_in_ctx = avcodec_alloc_context3(NULL);
    video_in_stream_index = 0;
  }

  video_out_ctx = avcodec_alloc_context3(NULL);

  // Copy params from instream to ctx
  if ( video_in_stream && ( video_in_ctx->codec_id == AV_CODEC_ID_H264 ) ) {
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
    ret = avcodec_parameters_to_context(video_out_ctx,
        video_in_stream->codecpar);
    if ( ret < 0 ) {
      Error("Could not initialize ctx parameteres");
      return;
    } else {
      Debug(2, "Going to dump the outctx");
      zm_dump_codec(video_out_ctx);
    }
#else
    avcodec_copy_context( video_out_ctx, video_in_ctx );
#endif
    video_out_ctx->time_base = (AVRational){1, 1000000}; // microseconds as base frame rate
    // Same codec, just copy the packets, otherwise we have to decode/encode
    video_out_codec = (AVCodec *)video_in_ctx->codec;
    // Only set orientation if doing passthrough, otherwise the frame image will be rotated
    Monitor::Orientation orientation = monitor->getOrientation();
    Debug(3, "Have orientation");
    if ( orientation ) {
      if ( orientation == Monitor::ROTATE_0 ) {
      } else if ( orientation == Monitor::ROTATE_90 ) {
        dsr = av_dict_set(&video_out_stream->metadata, "rotate", "90", 0);
        if ( dsr < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
      } else if ( orientation == Monitor::ROTATE_180 ) {
        dsr = av_dict_set(&video_out_stream->metadata, "rotate", "180", 0);
        if ( dsr < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
      } else if ( orientation == Monitor::ROTATE_270 ) {
        dsr = av_dict_set(&video_out_stream->metadata, "rotate", "270", 0);
        if ( dsr < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
      } else {
        Warning("Unsupported Orientation(%d)", orientation);
      }
    }
    // Fix deprecated formats
    switch ( video_out_ctx->pix_fmt ) {
      case AV_PIX_FMT_YUVJ420P :
        video_out_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
        break;
      case AV_PIX_FMT_YUVJ422P  :
        video_out_ctx->pix_fmt = AV_PIX_FMT_YUV422P;
        break;
      case AV_PIX_FMT_YUVJ444P   :
        video_out_ctx->pix_fmt = AV_PIX_FMT_YUV444P;
        break;
      case AV_PIX_FMT_YUVJ440P :
        video_out_ctx->pix_fmt = AV_PIX_FMT_YUV440P;
        break;
      default:
        break;
    }

  } else {

    /** Create a new frame to store the */
    if ( !(in_frame = zm_av_frame_alloc()) ) {
      Error("Could not allocate in frame");
      return;
    }
    // Don't have an input stream, so need to tell it what we are sending it, or are transcoding
    video_out_ctx->width = monitor->Width();
    video_out_ctx->height = monitor->Height();
    video_out_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
      if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
    video_out_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
#else
    video_out_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
#endif
      }

    if ( monitor->OutputCodec() == "mjpeg" ) {
      video_out_codec = avcodec_find_encoder_by_name("mjpeg");
      if ( ! video_out_codec ) {
        Debug(1, "Didn't find omx");
        video_out_codec = avcodec_find_encoder(AV_CODEC_ID_MJPEG);
      }
      video_out_ctx->codec_id = video_out_codec->id;
      video_out_ctx->pix_fmt = AV_PIX_FMT_YUVJ422P;

    } else if ( monitor->OutputCodec() == "h264" ) {
      video_out_codec = avcodec_find_encoder_by_name("h264_omx");
      if ( ! video_out_codec ) {
        Debug(1, "Didn't find omx");
        video_out_codec = avcodec_find_encoder(AV_CODEC_ID_H264);
      }
      if ( !video_out_codec ) {
        Fatal("Could not find codec for H264");
      }
      Debug(2, "Have video out codec");

      video_out_ctx->codec_id = AV_CODEC_ID_H264;
  //video_in_ctx->sample_aspect_ratio;
      /* take first format from list of supported formats */
      //video_out_ctx->pix_fmt = video_out_codec->pix_fmts[0];
      video_out_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
      /* video time_base can be set to whatever is handy and supported by encoder */
      video_out_ctx->time_base = (AVRational){1, 1000000}; // microseconds as base frame rate
      //video_out_ctx->framerate = (AVRational){0,24}; // Unknown framerate
#if 1
      video_out_ctx->gop_size = 12;
      video_out_ctx->qmin = 10;
      video_out_ctx->qmax = 51;
      video_out_ctx->qcompress = 0.6;
      video_out_ctx->bit_rate = 4000000;
#endif

      AVDictionary *opts = 0;
      std::string Options = monitor->GetEncoderOptions();
      ret = av_dict_parse_string(&opts, Options.c_str(), "=", ",#\n", 0);
      if ( ret < 0 ) {
        Warning("Could not parse ffmpeg encoder options list '%s'\n", Options.c_str());
      } else {
        AVDictionaryEntry *e = NULL;
        while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL ) {
          Debug( 3, "Encoder Option %s=%s", e->key, e->value );
        }
      }

#if 0
      if ( ! av_dict_get( opts, "preset", NULL, 0 ) ) {
        Debug(2,"Setting preset to superfast");
        av_dict_set( &opts, "preset", "superfast", 0 );
      }
      if ( ! av_dict_get( opts, "crf", NULL, 0 ) ) {
        Debug(2,"Setting crf to superfast");
        av_dict_set( &opts, "crf", "0", 0 );
      }
#endif
#if 0
      if ( ! av_dict_get( opts, "tune", NULL, 0 ) ) {
        Debug(2,"Setting tune to zerolatency");
        av_dict_set( &opts, "tune", "zerolatency", 0 );
      }
#endif

      if ( (ret = avcodec_open2(video_out_ctx, video_out_codec, &opts)) < 0 ) {
        Warning("Can't open video codec (%s)! %s, trying h264",
            video_out_codec->name,
            av_make_error_string(ret).c_str()
            );
        video_out_codec = avcodec_find_encoder_by_name("h264");
        if ( ! video_out_codec ) {
          Error("Can't find h264 encoder");
          video_out_codec = avcodec_find_encoder_by_name("libx264");
          if ( ! video_out_codec ) {
            Error("Can't find libx264 encoder");
            return;
          }
        }
#if 0 
      if ( ! av_dict_get( opts, "preset", NULL, 0 ) ) {
        Debug(2,"Setting preset to superfast");
        av_dict_set( &opts, "preset", "ultrafast", 0 );
      }
      if ( ! av_dict_get( opts, "crf", NULL, 0 ) ) {
        Debug(2,"Setting crf to 0");
        av_dict_set( &opts, "crf", "0", 0 );
      }
      if ( ! av_dict_get( opts, "tune", NULL, 0 ) ) {
        Debug(2,"Setting tune to zerolatency");
        av_dict_set( &opts, "tune", "zerolatency", 0 );
      }
#endif
        if ( (ret = avcodec_open2(video_out_ctx, video_out_codec, &opts)) < 0 ) {
          Error("Can't open video codec (%s)! %s",
              video_out_codec->name,
              av_make_error_string(ret).c_str() );
          return;
        }
      }
Debug(2,"Sucess opening codec");
      AVDictionaryEntry *e = NULL;
      while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL ) {
        Warning( "Encoder Option %s not recognized by ffmpeg codec", e->key);
      }
      av_dict_free(&opts);

      if ( !video_out_ctx->codec_tag ) {
        video_out_ctx->codec_tag =
          av_codec_get_tag(oc->oformat->codec_tag, AV_CODEC_ID_H264 );
        Debug(2, "No codec_tag, setting to h264 ? ");
      }
  } else {
Error("Codec not set");
    }// end if codec == h264

    swscale.SetDefaults(
        video_in_ctx->pix_fmt,
        video_out_ctx->pix_fmt,
        video_out_ctx->width,
        video_out_ctx->height
        );
  } // end if copying or trasncoding

  video_out_stream = avformat_new_stream(oc, video_out_codec);
  if ( ! video_out_stream ) {
    Fatal("Unable to create video out stream");
  } else {
    Debug(2, "Success creating video out stream");
  }
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
  ret = avcodec_parameters_from_context(video_out_stream->codecpar, video_out_ctx);
  if ( ret < 0 ) {
    Error("Could not initialize stream parameteres");
    return;
  }
  zm_dump_codecpar(video_out_stream->codecpar);
  zm_dump_codec(video_out_ctx);
#else
  avcodec_copy_context(video_out_stream->codec, video_out_ctx);
  Debug(2, "%dx%d", video_out_stream->codec->width, video_out_stream->codec->height );
  zm_dump_codec(video_out_ctx);
  zm_dump_codec(video_out_stream->codec);
#endif

#if 1
  video_out_stream->time_base.num = video_out_ctx->time_base.num;
  video_out_stream->time_base.den = video_out_ctx->time_base.den;
#endif

  Debug(3,
        "Time bases: VIDEO out stream: (%d/%d) out codec (%d/%d)",
        video_out_stream->time_base.num,
        video_out_stream->time_base.den,
        video_out_ctx->time_base.num,
        video_out_ctx->time_base.den);

  converted_in_samples = NULL;
  audio_out_codec = NULL;
  audio_in_ctx = NULL;
  audio_out_stream = NULL;
  out_frame = NULL;
#ifdef HAVE_LIBAVRESAMPLE
  resample_ctx = NULL;
#endif

  if ( audio_in_stream ) {
    audio_in_stream_index = audio_in_stream->index;
    Debug(3, "Have audio stream");
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)

    audio_in_ctx = avcodec_alloc_context3(NULL);
    ret = avcodec_parameters_to_context(audio_in_ctx,
                                        audio_in_stream->codecpar);
#else
    audio_in_ctx = audio_in_stream->codec;
#endif

    if ( audio_in_ctx->codec_id != AV_CODEC_ID_AAC ) {
      static char error_buffer[256];
      avcodec_string(error_buffer, sizeof(error_buffer), audio_in_ctx,
                     0);
      Debug(2, "Got something other than AAC (%s)", error_buffer);

      if (!setup_resampler()) {
        return;
      }
    } else {
      Debug(3, "Got AAC");

      audio_out_stream =
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
          avformat_new_stream(oc, (const AVCodec *)(audio_in_ctx->codec));
#else
          avformat_new_stream(oc, (AVCodec *)audio_in_ctx->codec);
#endif
      if (!audio_out_stream) {
        Error("Unable to create audio out stream\n");
        audio_out_stream = NULL;
      } else {
        Debug(2, "setting parameters");

#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
        audio_out_ctx = avcodec_alloc_context3(audio_out_codec);
        // Copy params from instream to ctx
        ret = avcodec_parameters_to_context(audio_out_ctx,
                                            audio_in_stream->codecpar);
        if (ret < 0) {
          Error("Unable to copy audio params to ctx %s\n",
                av_make_error_string(ret).c_str());
        }
        ret = avcodec_parameters_from_context(audio_out_stream->codecpar,
                                              audio_out_ctx);
        if (ret < 0) {
          Error("Unable to copy audio params to stream %s\n",
                av_make_error_string(ret).c_str());
        }

        if (!audio_out_ctx->codec_tag) {
          audio_out_ctx->codec_tag = av_codec_get_tag(
              oc->oformat->codec_tag, audio_in_ctx->codec_id);
          Debug(2, "Setting audio codec tag to %d",
                audio_out_ctx->codec_tag);
        }

#else
        audio_out_ctx = audio_out_stream->codec;
        ret = avcodec_copy_context(audio_out_ctx, audio_in_ctx);
        audio_out_ctx->codec_tag = 0;
#endif
        if (ret < 0) {
          Error("Unable to copy audio ctx %s\n",
                av_make_error_string(ret).c_str());
          audio_out_stream = NULL;
        } else {
          if (audio_out_ctx->channels > 1) {
            Warning("Audio isn't mono, changing it.");
            audio_out_ctx->channels = 1;
          } else {
            Debug(3, "Audio is mono");
          }
        }
      }  // end if audio_out_stream
    }    // end if is AAC

    if ( audio_out_stream ) {
      if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
    audio_out_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
#else
    audio_out_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
#endif
      }
    }
  }  // end if audio_in_stream

  video_last_pts = 0;
  video_last_dts = 0;
  audio_last_pts = 0;
  audio_last_dts = 0;
  video_next_pts = 0;
  video_next_dts = 0;
  audio_next_pts = 0;
  audio_next_dts = 0;
}  // VideoStore::VideoStore

bool VideoStore::open() {
  /* open the out file, if needed */
  if (!(out_format->flags & AVFMT_NOFILE)) {
    ret = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE, NULL, NULL);
    if (ret < 0) {
      Error("Could not open out file '%s': %s\n", filename,
            av_make_error_string(ret).c_str());
      return false;
    }
  }

  // os->ctx_inited = 1;
  // avio_flush(ctx->pb);
  // av_dict_free(&opts);
  zm_dump_stream_format(oc, 0, 0, 1);
  if (audio_out_stream) zm_dump_stream_format(oc, 1, 0, 1);

  AVDictionary *opts = NULL;
  // av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0);
   av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0);
  // av_dict_set(&opts, "movflags",
  // "frag_keyframe+empty_moov+default_base_moof", 0);
  if ( (ret = avformat_write_header(oc, &opts)) < 0 ) {
    // if ((ret = avformat_write_header(oc, &opts)) < 0) {
    Warning("Unable to set movflags to frag_custom+dash+delay_moov");
    /* Write the stream header, if any. */
    ret = avformat_write_header(oc, NULL);
  } else if ( av_dict_count(opts) != 0 ) {
    Warning("some options not set\n");
  }
  if ( ret < 0 ) {
    Error("Error occurred when writing out file header to %s: %s\n",
          filename, av_make_error_string(ret).c_str());
    return false;
  }
  if ( opts ) av_dict_free(&opts);
  return true;
} // end bool VideoStore::open()

void VideoStore::write_audio_packet( AVPacket &pkt ) {
//Debug(2, "writing audio packet pts(%d) dts(%d) duration(%d)", pkt.pts,
      //pkt.dts, pkt.duration);
  pkt.pts = audio_next_pts;
  pkt.dts = audio_next_dts;

  if (pkt.duration > 0)
    pkt.duration =
      av_rescale_q(pkt.duration, audio_out_ctx->time_base,
          audio_out_stream->time_base);
  audio_next_pts += pkt.duration;
  audio_next_dts += pkt.duration;

  Debug(2, "writing audio packet pts(%d) dts(%d) duration(%d)", pkt.pts,
      pkt.dts, pkt.duration);
  pkt.stream_index = audio_out_stream->index;
  av_interleaved_write_frame(oc, &pkt);
}

VideoStore::~VideoStore() {
  if ( video_out_ctx->codec_id != video_in_ctx->codec_id ) {
Debug(2,"Different codecs between in and out");

#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
    if ( video_out_ctx->codec && ( video_out_ctx->codec->capabilities & AV_CODEC_CAP_DELAY ) ) {
#else
    if ( video_out_ctx->codec && ( video_out_ctx->codec->capabilities & CODEC_CAP_DELAY ) ) {
#endif

      // The codec queues data.  We need to send a flush command and out
      // whatever we get. Failures are not fatal.
      AVPacket pkt;
      av_init_packet(&pkt);

#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
      // Put encoder into flushing mode
      avcodec_send_frame(video_out_ctx, NULL);
      while (1) {
        ret = avcodec_receive_packet(video_out_ctx, &pkt);
        if (ret < 0) {
          if (AVERROR_EOF != ret) {
            Error("ERror encoding audio while flushing (%d) (%s)", ret,
                av_err2str(ret));
          }
          break;
        }
#else
        while (1) {
          // WIthout these we seg fault I don't know why.
          pkt.data = NULL;
          pkt.size = 0;
          av_init_packet(&pkt);
          int got_packet = 0;
          ret = avcodec_encode_video2(video_out_ctx, &pkt, NULL, &got_packet);
          if ( ret < 0 ) {
            Error("ERror encoding video while flushing (%d) (%s)", ret,
                av_err2str(ret));
            break;
          }
          if (!got_packet) {
            break;
          }
#endif
  int keyframe = pkt.flags & AV_PKT_FLAG_KEY;
Debug(3, "dts:%d, pts:%d, keyframe:%d", pkt.dts, pkt.pts, keyframe );
          //pkt.dts = video_next_dts;
          pkt.pts = pkt.dts;
          //pkt.duration = video_last_duration;
          write_video_packet(pkt);
          zm_av_packet_unref(&pkt);
        }  // while have buffered frames
      } // end if have delay capability
  } // end if have buffered video

  if ( audio_out_codec ) {
    // The codec queues data.  We need to send a flush command and out
    // whatever we get. Failures are not fatal.
    AVPacket pkt;
    // WIthout these we seg fault I don't know why.
    pkt.data = NULL;
    pkt.size = 0;
    av_init_packet(&pkt);

#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
    // Put encoder into flushing mode
    avcodec_send_frame(audio_out_ctx, NULL);
    while (1) {
      ret = avcodec_receive_packet(audio_out_ctx, &pkt);
      if (ret < 0) {
        if (AVERROR_EOF != ret) {
          Error("ERror encoding audio while flushing (%d) (%s)", ret,
                av_err2str(ret));
        }
        break;
      }
#else
    while (1) {
      int got_packet = 0;
      ret =
          avcodec_encode_audio2(audio_out_ctx, &pkt, NULL, &got_packet);
      if (ret < 0) {
        Error("ERror encoding audio while flushing (%d) (%s)", ret,
              av_err2str(ret));
        break;
      }
      Debug(1, "Have audio encoder, need to flush it's out");
      if (!got_packet) {
        break;
      }
#endif
      write_audio_packet(pkt);
      zm_av_packet_unref(&pkt);
    }  // while have buffered frames
  }    // end if audio_out_codec

  // Flush Queues
  av_interleaved_write_frame(oc, NULL);

  /* Write the trailer before close */
  if (int rc = av_write_trailer(oc)) {
    Error("Error writing trailer %s", av_err2str(rc));
  } else {
    Debug(3, "Sucess Writing trailer");
  }

  // I wonder if we should be closing the file first.
  // I also wonder if we really need to be doing all the ctx
  // allocation/de-allocation constantly, or whether we can just re-use it.
  // Just do a file open/close/writeheader/etc.
  // What if we were only doing audio recording?
// Used by both audio and video conversions
    if ( in_frame ) {
      av_frame_free(&in_frame);
      in_frame = NULL;
    }
  if ( audio_in_ctx ) {
    avcodec_free_context(&audio_in_ctx);
    audio_in_ctx = NULL;
  }
  if ( audio_out_stream ) {
    avcodec_close(audio_out_ctx);
    avcodec_free_context(&audio_out_ctx);
    audio_out_ctx = NULL;
#ifdef HAVE_LIBAVRESAMPLE
    if ( resample_ctx ) {
      avresample_close(resample_ctx);
      avresample_free(&resample_ctx);
    }
    if ( out_frame ) {
      av_frame_free(&out_frame);
      out_frame = NULL;
    }
    if ( converted_in_samples ) {
      av_free(converted_in_samples);
      converted_in_samples = NULL;
    }
#endif
  }
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
  if ( video_in_ctx ) {
    avcodec_free_context(&video_in_ctx);
    video_in_ctx = NULL;
  }
  if ( video_out_ctx ) {
    avcodec_close(video_out_ctx);
    avcodec_free_context(&video_out_ctx);
    video_out_ctx = NULL;
  }
#endif

  // When will be not using a file ? // Might someday use this for streaming
  if ( !(out_format->flags & AVFMT_NOFILE) ) {
    /* Close the out file. */
    if ( int rc = avio_close(oc->pb) ) {
      Error("Error closing avio %s", av_err2str(rc));
    }
  } else {
    Debug(3, "Not closing avio because we are not writing to a file.");
  }

  /* free the stream */
  avformat_free_context(oc);
}

bool VideoStore::setup_resampler() {
#ifdef HAVE_LIBAVRESAMPLE
  // Newer ffmpeg wants to keep everything separate... so have to lookup our own
  // decoder, can't reuse the one from the camera.
  AVCodec *audio_in_codec = avcodec_find_decoder(
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
      audio_in_stream->codecpar->codec_id
#else
      audio_in_ctx->codec_id
#endif
      );
  ret = avcodec_open2(audio_in_ctx, audio_in_codec, NULL);
  if (ret < 0) {
    Error("Can't open in codec!");
    return false;
  }

  audio_out_codec = avcodec_find_encoder(AV_CODEC_ID_AAC);
  if ( !audio_out_codec ) {
    Error("Could not find codec for AAC");
    return false;
  }
  Debug(2, "Have audio out codec");

  // audio_out_ctx = audio_out_stream->codec;
  audio_out_ctx = avcodec_alloc_context3(audio_out_codec);
  if ( !audio_out_ctx ) {
    Error("could not allocate codec ctx for AAC\n");
    audio_out_stream = NULL;
    return false;
  }

  /* put sample parameters */
  audio_out_ctx->bit_rate = audio_in_ctx->bit_rate;
  audio_out_ctx->sample_rate = audio_in_ctx->sample_rate;
  audio_out_ctx->channels = audio_in_ctx->channels;
  audio_out_ctx->channel_layout = audio_in_ctx->channel_layout;
  audio_out_ctx->sample_fmt = audio_in_ctx->sample_fmt;
  //audio_out_ctx->refcounted_frames = 1;

  if ( audio_out_codec->supported_samplerates ) {
    int found = 0;
    for ( int i=0; audio_out_codec->supported_samplerates[i]; i++) {
      if ( audio_out_ctx->sample_rate ==
          audio_out_codec->supported_samplerates[i]) {
        found = 1;
        break;
      }
    }
    if ( found ) {
      Debug(3, "Sample rate is good");
    } else {
      audio_out_ctx->sample_rate =
          audio_out_codec->supported_samplerates[0];
      Debug(1, "Sampel rate is no good, setting to (%d)",
            audio_out_codec->supported_samplerates[0]);
    }
  }

  /* check that the encoder supports s16 pcm in */
  if ( !check_sample_fmt(audio_out_codec, audio_out_ctx->sample_fmt) ) {
    Debug(3, "Encoder does not support sample format %s, setting to FLTP",
          av_get_sample_fmt_name(audio_out_ctx->sample_fmt));
    audio_out_ctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
  }

  audio_out_ctx->time_base = (AVRational){1, audio_out_ctx->sample_rate};

  // Now copy them to the out stream
  audio_out_stream = avformat_new_stream(oc, audio_out_codec);

#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
  if ( (ret = avcodec_parameters_from_context(audio_out_stream->codecpar,
                                        audio_out_ctx)) < 0 ) {
    Error("Could not initialize stream parameteres");
    return false;
  }
#endif

  AVDictionary *opts = NULL;
  av_dict_set(&opts, "strict", "experimental", 0); // Needed to allow AAC
  ret = avcodec_open2(audio_out_ctx, audio_out_codec, &opts);
  av_dict_free(&opts);
  if ( ret < 0 ) {
    Fatal("could not open codec (%d) (%s)\n", ret, av_make_error_string(ret).c_str());
    audio_out_codec = NULL;
    audio_out_ctx = NULL;
    audio_out_stream = NULL;
    return false;
  }

  Debug(1,
        "Audio out bit_rate (%d) sample_rate(%d) channels(%d) fmt(%d) "
        "layout(%d) frame_size(%d)",
        audio_out_ctx->bit_rate, audio_out_ctx->sample_rate,
        audio_out_ctx->channels, audio_out_ctx->sample_fmt,
        audio_out_ctx->channel_layout, audio_out_ctx->frame_size);

  /** Create a new frame to store the audio samples. */
  if ( ! in_frame ) {
    if (!(in_frame = zm_av_frame_alloc())) {
      Error("Could not allocate in frame");
      return false;
    }
  }

  /** Create a new frame to store the audio samples. */
  if ( !(out_frame = zm_av_frame_alloc()) ) {
    Error("Could not allocate out frame");
    av_frame_free(&in_frame);
    return false;
  }

  // Setup the audio resampler
  resample_ctx = avresample_alloc_context();
  if ( !resample_ctx ) {
    Error("Could not allocate resample ctx\n");
    return false;
  }

  // Some formats (i.e. WAV) do not produce the proper channel layout
  if ( audio_in_ctx->channel_layout == 0 ) {
    uint64_t layout = av_get_channel_layout("mono");
    av_opt_set_int(resample_ctx, "in_channel_layout",
                   av_get_channel_layout("mono"), 0);
    Debug(1, "Bad channel layout. Need to set it to mono (%d).", layout);
  } else {
    av_opt_set_int(resample_ctx, "in_channel_layout",
                   audio_in_ctx->channel_layout, 0);
  }

  av_opt_set_int(resample_ctx, "in_sample_fmt", audio_in_ctx->sample_fmt, 0);
  av_opt_set_int(resample_ctx, "in_sample_rate", audio_in_ctx->sample_rate, 0);
  av_opt_set_int(resample_ctx, "in_channels", audio_in_ctx->channels, 0);
  // av_opt_set_int( resample_ctx, "out_channel_layout",
  // audio_out_ctx->channel_layout, 0);
  av_opt_set_int(resample_ctx, "out_channel_layout",
                 av_get_channel_layout("mono"), 0);
  av_opt_set_int(resample_ctx, "out_sample_fmt",
                 audio_out_ctx->sample_fmt, 0);
  av_opt_set_int(resample_ctx, "out_sample_rate",
                 audio_out_ctx->sample_rate, 0);
  av_opt_set_int(resample_ctx, "out_channels",
                 audio_out_ctx->channels, 0);

  if ( (ret = avresample_open(resample_ctx)) < 0 ) {
    Error("Could not open resample ctx\n");
    return false;
  }

  out_frame->nb_samples = audio_out_ctx->frame_size;
  out_frame->format = audio_out_ctx->sample_fmt;
  out_frame->channel_layout = audio_out_ctx->channel_layout;

  // The codec gives us the frame size, in samples, we calculate the size of the
  // samples buffer in bytes
  unsigned int audioSampleBuffer_size = av_samples_get_buffer_size(
      NULL, audio_out_ctx->channels, audio_out_ctx->frame_size,
      audio_out_ctx->sample_fmt, 0);
  converted_in_samples = (uint8_t *)av_malloc(audioSampleBuffer_size);

  if ( !converted_in_samples ) {
    Error("Could not allocate converted in sample pointers\n");
    return false;
  }

  // Setup the data pointers in the AVFrame
  if ( avcodec_fill_audio_frame(out_frame, audio_out_ctx->channels,
                               audio_out_ctx->sample_fmt,
                               (const uint8_t *)converted_in_samples,
                               audioSampleBuffer_size, 0) < 0 ) {
    Error("Could not allocate converted in sample pointers\n");
    return false;
  }

  return true;
#else
  Error(
      "Not built with libavresample library. Cannot do audio conversion to "
      "AAC");
  return false;
#endif
}  // end bool VideoStore::setup_resampler()

void VideoStore::dumpPacket(AVPacket *pkt) {
  char b[10240];

  snprintf(b, sizeof(b),
           " pts: %" PRId64 ", dts: %" PRId64
           ", data: %p, size: %d, sindex: %d, dflags: %04x, s-pos: %" PRId64
           ", c-duration: %" PRId64 "\n",
           pkt->pts, 
           pkt->dts,
           pkt->data,
           pkt->size,
           pkt->stream_index,
           pkt->flags,
           pkt->pos,
           pkt->duration);
  Debug(1, "%s:%d:DEBUG: %s", __FILE__, __LINE__, b);
}

int VideoStore::writePacket( ZMPacket *ipkt ) {
  if ( ipkt->packet.stream_index == video_in_stream_index ) {
    return writeVideoFramePacket( ipkt );
  } else if ( ipkt->packet.stream_index == audio_in_stream_index ) {
    return writeAudioFramePacket( ipkt );
  }
  Error("Unknown stream type in packet (%d) out input video stream is (%d) and audio is (%d)",
      ipkt->packet.stream_index, video_in_stream_index, ( audio_in_stream ? audio_in_stream_index : -1 )
      );
  return 0;
}

int VideoStore::writeVideoFramePacket( ZMPacket * zm_packet ) {
  frame_count += 1;

  // if we have to transcode
  if ( video_out_ctx->codec_id != video_in_ctx->codec_id ) {
    Debug(3, "Have encoding video frame count (%d)", frame_count);

    if ( ! zm_packet->out_frame ) {
      Debug(3, "Have no out frame");
      AVFrame *out_frame = zm_packet->out_frame = zm_av_frame_alloc();
      if ( ! out_frame ) {
        Error("Unable to allocate a frame");
        return 0;
      }
#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
      int codec_imgsize = av_image_get_buffer_size(
          video_out_ctx->pix_fmt,
          video_out_ctx->width,
          video_out_ctx->height, 1);
      zm_packet->buffer = (uint8_t *)av_malloc(codec_imgsize);
      av_image_fill_arrays(
          out_frame->data,
          out_frame->linesize,
          zm_packet->buffer,
          video_out_ctx->pix_fmt,
          video_out_ctx->width,
          video_out_ctx->height,
          1);
#else
      int codec_imgsize = avpicture_get_size(
          video_out_ctx->pix_fmt,
          video_out_ctx->width,
          video_out_ctx->height);
      zm_packet->buffer = (uint8_t *)av_malloc(codec_imgsize);
      avpicture_fill(
          (AVPicture *)out_frame,
          zm_packet->buffer,
          video_out_ctx->pix_fmt,
          video_out_ctx->width,
          video_out_ctx->height
          );
#endif

      out_frame->width = video_out_ctx->width;
      out_frame->height = video_out_ctx->height;
      out_frame->format = video_out_ctx->pix_fmt;

      if ( ! zm_packet->in_frame ) {
        Debug(2,"Have no in_frame");
        if ( zm_packet->packet.size ) {
          Debug(2,"Decoding");
          if ( ! zm_packet->decode( video_in_ctx ) ) {
            Debug(2, "unable to decode yet.");
            return 0;
          }
          //Go straight to out frame
          swscale.Convert( zm_packet->in_frame, out_frame );
        } else if ( zm_packet->image ) {
          Debug(2,"Have an image, convert it");
          //Go straight to out frame
          swscale.Convert(zm_packet->image, 
              zm_packet->buffer,
              codec_imgsize,
              (AVPixelFormat)zm_packet->image->AVPixFormat(),
              video_out_ctx->pix_fmt,
              video_out_ctx->width,
              video_out_ctx->height
              );

        } else {
          Error("Have neither in_frame or image!");
          return 0;
        } // end if has packet or image
      } else {
        // Have in_frame.... may need to convert it to out_frame
        swscale.Convert(zm_packet->in_frame, zm_packet->out_frame);
      } // end if no in_frame
    } // end if no out_frame

    if ( ! video_last_pts ) {
      video_last_pts = zm_packet->timestamp->tv_sec*1000000 + zm_packet->timestamp->tv_usec;
      zm_packet->out_frame->pts = 0;
    } else {
      zm_packet->out_frame->pts = ( zm_packet->timestamp->tv_sec*1000000 + zm_packet->timestamp->tv_usec ) - video_last_pts;
    }

    // Do this to allow the encoder to choose whether to use I/P/B frame
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
    zm_packet->out_frame->pict_type = AV_PICTURE_TYPE_NONE;
    if ( (ret = avcodec_send_frame(video_out_ctx, zm_packet->out_frame)) < 0 ) {
      Error("Could not send frame (error '%s')", av_make_error_string(ret).c_str());
      return -1;
    }

    av_init_packet(&opkt);
    if ( (ret = avcodec_receive_packet(video_out_ctx, &opkt)) < 0 ) {
      zm_av_packet_unref(&opkt);
      if ( AVERROR(EAGAIN) == ret ) {
        // THe codec may need more samples than it has, perfectly valid
        Debug(3, "Could not recieve packet (error '%s')",
              av_make_error_string(ret).c_str());
        return 0;
      } else {
        Error("Could not recieve packet (error %d = '%s')", ret,
              av_make_error_string(ret).c_str());
      }
      return -1;
    }
#else
    av_init_packet(&opkt);
    int data_present;
    if ( (ret = avcodec_encode_video2(
            video_out_ctx, &opkt, zm_packet->out_frame, &data_present)) < 0) {
      Error("Could not encode frame (error '%s')",
            av_make_error_string(ret).c_str());
      zm_av_packet_unref(&opkt);
      return 0;
    }
    if ( !data_present ) {
      Debug(2, "Not ready to out a frame yet.");
      zm_av_packet_unref(&opkt);
      return 0;
    }
#endif

  } else {
    AVPacket *ipkt = &zm_packet->packet;
    Debug(3, "Doing passthrough, just copy packet");
    // Just copy it because the codec is the same
    av_init_packet(&opkt);
    opkt.data = ipkt->data;
    opkt.size = ipkt->size;
    opkt.flags = ipkt->flags;
    if ( ! video_last_pts ) {
      video_last_pts = zm_packet->timestamp->tv_sec*1000000 + zm_packet->timestamp->tv_usec;
      opkt.dts = opkt.pts = 0;
    } else {
      opkt.dts = opkt.pts = ( zm_packet->timestamp->tv_sec*1000000 + zm_packet->timestamp->tv_usec ) - video_last_pts;
    }
  }
  opkt.duration = 0;

Debug(3, "dts:%d, pts:%d, keyframe:%d", opkt.dts, opkt.pts, opkt.flags & AV_PKT_FLAG_KEY );
  write_video_packet( opkt );
  zm_av_packet_unref(&opkt);

  return 1;
}  // end int VideoStore::writeVideoFramePacket( AVPacket *ipkt )

void VideoStore::write_video_packet( AVPacket &opkt ) {

  if ( opkt.dts > opkt.pts ) {
    Debug(1,
          "opkt.dts(%d) must be <= opkt.pts(%d). Decompression must happen "
          "before presentation.",
          opkt.dts, opkt.pts);
    opkt.dts = opkt.pts;
  }

  opkt.pos = -1;
  opkt.stream_index = video_out_stream->index;

  //video_next_dts += opkt.duration;
  //video_next_pts += opkt.duration;

  //AVPacket safepkt;
  //memcpy(&safepkt, &opkt, sizeof(AVPacket));
  //av_packet_rescale_ts( &opkt, video_out_ctx->time_base, video_out_stream->time_base );

  Debug(1,
        "writing video packet pts(%d) dts(%d) duration(%d) packet_count(%d)",
         opkt.pts, opkt.dts, opkt.duration, packets_written );
  if ( (opkt.data == NULL) || (opkt.size < 1) ) {
    Warning("%s:%d: Mangled AVPacket: discarding frame", __FILE__, __LINE__);
    //dumpPacket(&opkt);

  //} else if ((video_next_dts > 0) && (video_next_dts > opkt.dts)) {
    //Warning("%s:%d: DTS out of order: next:%lld \u226E opkt.dts %lld; discarding frame",
            //__FILE__, __LINE__, video_next_dts, opkt.dts);
    //video_next_dts = opkt.dts;
    //dumpPacket(&opkt);

  } else {
    if ( (ret = av_interleaved_write_frame(oc, &opkt)) < 0 ) {
      // There's nothing we can really do if the frame is rejected, just drop it
      // and get on with the next
      Warning(
          "%s:%d: Writing frame [av_interleaved_write_frame()] failed: %s(%d) "
          " ",
          __FILE__, __LINE__, av_make_error_string(ret).c_str(), (ret));

      //dumpPacket(&safepkt);
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
      if ( video_in_stream )
        zm_dump_codecpar(video_in_stream->codecpar);
      zm_dump_codecpar(video_out_stream->codecpar);
#endif
    } else {
      packets_written += 1;
    }
  }

} // end void VideoStore::write_video_packet

int VideoStore::writeAudioFramePacket(ZMPacket *zm_packet) {
  Debug(4, "writeAudioFrame");

  AVPacket *ipkt = &zm_packet->packet;

  if ( !audio_out_stream ) {
    Debug(1, "Called writeAudioFramePacket when no audio_out_stream");
    return 0;  // FIXME -ve return codes do not free packet in ffmpeg_camera at
               // the moment
  }

  if ( audio_out_codec ) {
    Debug(3, "Have audio codec");
#ifdef HAVE_LIBAVRESAMPLE

#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
    if ( (ret = avcodec_send_packet(audio_in_ctx, ipkt)) < 0 ) {
      Error("avcodec_send_packet fail %s", av_make_error_string(ret).c_str());
      return 0;
    }
    if ( (ret = avcodec_receive_frame(audio_in_ctx, in_frame)) < 0 ) {
      Error("avcodec_receive_frame fail %s", av_make_error_string(ret).c_str());
      return 0;
    }
    Debug(2,
          "Input Frame: samples(%d), format(%d), sample_rate(%d), channel "
          "layout(%d)",
          in_frame->nb_samples, in_frame->format,
          in_frame->sample_rate, in_frame->channel_layout);
#else
    /**
     * Decode the audio frame stored in the packet.
     * The in audio stream decoder is used to do this.
     * If we are at the end of the file, pass an empty packet to the decoder
     * to flush it.
     */
    int data_present;
    if ( (ret = avcodec_decode_audio4(audio_in_ctx, in_frame,
                                     &data_present, ipkt)) < 0 ) {
      Error("Could not decode frame (error '%s')\n",
            av_make_error_string(ret).c_str());
      dumpPacket(ipkt);
      av_frame_free(&in_frame);
      return 0;
    }
    if ( !data_present ) {
      Debug(2, "Not ready to transcode a frame yet.");
      return 0;
    }
#endif
    int frame_size = out_frame->nb_samples;
    in_frame->pts = audio_next_pts;

    // Resample the in into the audioSampleBuffer until we proceed the whole
    // decoded data
    if ((ret = avresample_convert(resample_ctx, NULL, 0, 0, in_frame->data,
                                0, frame_size)) < 0) {
      Error("Could not resample frame (error '%s')\n",
            av_make_error_string(ret).c_str());
      av_frame_unref(in_frame);
      return 0;
    }
    av_frame_unref(in_frame);

    int samples_available = avresample_available(resample_ctx);
    if ( samples_available < frame_size ) {
      Debug(1, "Not enough samples yet (%d)", samples_available);
      return 0;
    }

    Debug(3, "Output_frame samples (%d)", out_frame->nb_samples);
    // Read a frame audio data from the resample fifo
    if ( avresample_read(resample_ctx, out_frame->data, frame_size) != frame_size) {
      Warning("Error reading resampled audio: ");
      return 0;
    }
    Debug(2,
          "Frame: samples(%d), format(%d), sample_rate(%d), channel layout(%d)",
          out_frame->nb_samples, out_frame->format,
          out_frame->sample_rate, out_frame->channel_layout);

    av_init_packet(&opkt);
    Debug(5, "after init packet");

#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
    if ((ret = avcodec_send_frame(audio_out_ctx, out_frame)) < 0) {
      Error("Could not send frame (error '%s')",
            av_make_error_string(ret).c_str());
      zm_av_packet_unref(&opkt);
      return 0;
    }

    // av_frame_unref( out_frame );

    if ( (ret = avcodec_receive_packet(audio_out_ctx, &opkt)) < 0 ) {
      if ( AVERROR(EAGAIN) == ret ) {
        // THe codec may need more samples than it has, perfectly valid
        Debug(3, "Could not recieve packet (error '%s')",
              av_make_error_string(ret).c_str());
      } else {
        Error("Could not recieve packet (error %d = '%s')", ret,
              av_make_error_string(ret).c_str());
      }
      //zm_av_packet_unref(&opkt);
      av_frame_unref(in_frame);
      // av_frame_unref( out_frame );
      return 0;
    }
#else
    if ( (ret = avcodec_encode_audio2(audio_out_ctx, &opkt, out_frame,
                                     &data_present)) < 0) {
      Error("Could not encode frame (error '%s')",
            av_make_error_string(ret).c_str());
      zm_av_packet_unref(&opkt);
      return 0;
    }
    if ( !data_present ) {
      Debug(2, "Not ready to out a frame yet.");
      zm_av_packet_unref(&opkt);
      return 0;
    }
#endif

#endif
    opkt.duration = out_frame->nb_samples;
  } else {
    av_init_packet(&opkt);
    Debug(5, "after init packet");
    opkt.data = ipkt->data;
    opkt.size = ipkt->size;
    opkt.duration = ipkt->duration;
  }

// PTS is difficult, because of the buffering of the audio packets in the
// resampler.  So we have to do it once we actually have a packet...
// audio_last_pts is the pts of ipkt, audio_next_pts is the last pts of the
// out

// Scale the PTS of the outgoing packet to be the correct time base
#if 0
  if ( ipkt->pts != AV_NOPTS_VALUE ) {
    if ( !audio_last_pts ) {
      opkt.pts = 0;
      Debug(1, "No audio_last_pts");
    } else {
      if ( audio_last_pts > ipkt->pts ) {
        Debug(1, "Resetting audio_start_pts from (%d) to (%d)",  audio_last_pts, ipkt->pts);
        opkt.pts = audio_next_pts + av_rescale_q(ipkt->pts, audio_in_stream->time_base, audio_out_stream->time_base);
      } else {
        opkt.pts = audio_next_pts + av_rescale_q(ipkt->pts - audio_last_pts, audio_in_stream->time_base, audio_out_stream->time_base);
      }
      Debug(2, "audio opkt.pts = %d from ipkt->pts(%d) - last_pts(%d)", opkt.pts, ipkt->pts, audio_last_pts);
    }
    audio_last_pts = ipkt->pts;
  } else {
    Debug(2, "opkt.pts = undef");
    opkt.pts = AV_NOPTS_VALUE;
  }
#else
  opkt.pts = audio_next_pts;
  opkt.dts = audio_next_dts;
#endif

#if 0
    if ( ipkt->dts == AV_NOPTS_VALUE ) {
      // So if the in has no dts assigned... still need an out dts... so we use cur_dts?

      if ( audio_last_dts >= audio_in_stream->cur_dts ) {
        Debug(1, "Resetting audio_last_dts from (%d) to cur_dts (%d)", audio_last_dts, audio_in_stream->cur_dts);
        opkt.dts = audio_next_dts + av_rescale_q( audio_in_stream->cur_dts,  AV_TIME_BASE_Q, audio_out_stream->time_base);
      } else {
        opkt.dts = audio_next_dts + av_rescale_q( audio_in_stream->cur_dts - audio_last_dts, AV_TIME_BASE_Q, audio_out_stream->time_base);
      }
      audio_last_dts = audio_in_stream->cur_dts;
      Debug(2, "opkt.dts = %d from video_in_stream->cur_dts(%d) - last_dts(%d)", opkt.dts, audio_in_stream->cur_dts, audio_last_dts);
    } else {
      if ( audio_last_dts >= ipkt->dts ) {
        Debug(1, "Resetting audio_last_dts from (%d) to (%d)",  audio_last_dts, ipkt->dts );
        opkt.dts = audio_next_dts + av_rescale_q(ipkt->dts, audio_in_stream->time_base, audio_out_stream->time_base);
      } else {
        opkt.dts = audio_next_dts + av_rescale_q(ipkt->dts - audio_last_dts, audio_in_stream->time_base, audio_out_stream->time_base);
        Debug(2, "opkt.dts = %d from previous(%d) + ( ipkt->dts(%d) - last_dts(%d) )", opkt.dts, audio_next_dts, ipkt->dts, audio_last_dts );
      }
    }
  }
#endif
  // audio_last_dts = ipkt->dts;
  if ( opkt.dts > opkt.pts ) {
    Debug(1,
          "opkt.dts(%d) must be <= opkt.pts(%d). Decompression must happen "
          "before presentation.",
          opkt.dts, opkt.pts);
    opkt.dts = opkt.pts;
  }

  //opkt.duration = out_frame ? out_frame->nb_samples : ipkt->duration;
  // opkt.duration = av_rescale_q(ipkt->duration, audio_in_stream->time_base,
  // audio_out_stream->time_base);
  Debug(2, "opkt.pts (%d), opkt.dts(%d) opkt.duration = (%d)", opkt.pts,
        opkt.dts, opkt.duration);

  // pkt.pos:  byte position in stream, -1 if unknown
  opkt.pos = -1;
  opkt.stream_index = audio_out_stream->index;
  audio_next_dts = opkt.dts + opkt.duration;
  audio_next_pts = opkt.pts + opkt.duration;

  AVPacket safepkt;
  memcpy(&safepkt, &opkt, sizeof(AVPacket));
  ret = av_interleaved_write_frame(oc, &opkt);
  if ( ret != 0 ) {
    Error("Error writing audio frame packet: %s\n",
          av_make_error_string(ret).c_str());
    dumpPacket(&safepkt);
  } else {
    Debug(2, "Success writing audio frame");
  }
  zm_av_packet_unref(&opkt);
  return 1;
}  // end int VideoStore::writeAudioFramePacket( AVPacket *ipkt )

int VideoStore::write_packets( zm_packetqueue &queue ) {
  // Need to write out all the frames from the last keyframe?
  // No... need to write out all frames from when the event began. Due to PreEventFrames, this could be more than since the last keyframe.
  unsigned int packet_count = 0;
  ZMPacket *queued_packet;

  while ( ( queued_packet = queue.popPacket() ) ) {
    AVPacket *avp = queued_packet->av_packet();

    packet_count += 1;
    //Write the packet to our video store
    Debug(2, "Writing queued packet stream: %d  KEY %d, remaining (%d)", avp->stream_index, avp->flags & AV_PKT_FLAG_KEY, queue.size() );
    int ret = this->writePacket( queued_packet );
    if ( ret < 0 ) {
      //Less than zero and we skipped a frame
    }
    delete queued_packet;
  } // end while packets in the packetqueue
  Debug(2, "Wrote %d queued packets", packet_count );
  return packet_count;
} // end int VideoStore::write_packets( PacketQueue &queue ) {