4e8ac47060
Use the video_first_pts to set the audio_first_pts
2019-07-02 11:58:22 -04:00
dd57fd95ce
Clean up cruft from videostore api. Fix packetqueue clear_unwanted_packets to take a pre_event_count and take it into consideration when finding the right spot in the queue to start recording.
2019-06-27 11:11:14 -04:00
46f3aabc25
Merge branch 'hwdecode' into storageareas
2019-06-25 15:35:56 -04:00
86c4051c44
handle zm_receive_frame returning AVERROR instead of boolean
2019-06-25 15:34:36 -04:00
9a353d0b6d
don't set frame size
2019-06-24 11:44:21 -04:00
44e4d93445
Merge branch 'master' into storageareas
2019-06-24 11:35:36 -04:00
dab9544845
Revert audio sync fixes ( #2646 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* Revert the work I did to srt packets by dts after changing their time_base. It doesn't work. Instead since dts doesn't actually matter to playback, only ffmpeg storing, munge it to whatever is neccessary to make ffmpeg happy.
2019-06-24 11:27:47 -04:00
55d98e4a9f
fix crash
2019-06-20 15:56:25 -04:00
470da03322
Merge sync fixes from storageareas
2019-06-20 15:14:20 -04:00
4c8b8d0c16
Only check pts vs dts if pts isn't AV_NOPTS_VALUE. Also set frame_size in output codec when doing passthrough
2019-06-20 15:09:30 -04:00
16b035f76c
Use common first_dts/pts instead of separate video and audio first pts/dts
2019-06-19 09:22:21 -04:00
acb95709e6
Fix issues with too much audio in events by storing packets in the queue with their timestamps converted to AV_TIME_BASE_Q, so that we can sort video and audio packets together.
2019-06-11 10:19:42 -04:00
8b4fddadfb
out_frame->pts is calculated in resample_audio
2019-05-27 12:29:29 -04:00
c257fb46f6
Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas
2019-05-13 10:34:45 -04:00
22c5d46c65
rescale audio packet duration and pts before feeding to codec after resample
2019-05-12 12:14:03 -04:00
d7daf8550f
Merge branch 'master' into storageareas
2019-05-12 09:37:41 -04:00
453bc2afd8
more frame dumping in resample
2019-05-12 09:36:26 -04:00
67c20aa976
fix frame->duration to frame->pkt_duration
2019-05-10 12:58:54 -04:00
d3a680aaa3
Set out_frame duration when resampling. Better error message if failed to write to fifo
2019-05-10 12:31:10 -04:00
50070a9a7c
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-05-03 14:59:14 -04:00
1e08b333b4
choose cur_dts instead of 0 for dts
2019-05-03 14:59:09 -04:00
18285e1b94
fix using in_frame->nb_samples instead of out_frame->nb_samples in resample fifo.
2019-04-25 18:45:43 -04:00
3664084862
Handle out of order dts in writeAudioFrame
2019-04-15 13:27:13 -04:00
439a7b3ab3
Don't set bitrate, etc when h264. Causing crashes in ffmpeg 4.11.
2019-04-14 13:50:10 -04:00
fab548b119
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-08 16:46:28 -04:00
1b98f3529f
allow non-increasing dts in muxer
2019-04-08 14:18:59 -04:00
7f2440177b
remove duplicate dump_codec
2019-04-08 13:51:55 -04:00
3c57d79669
Go back to using video_first_dts
2019-04-08 10:04:26 -04:00
8d3fa807e2
compilation fixes for old ffmpeg
2019-04-03 16:51:41 -04:00
94479fc850
copy pkt flags as well. When pts is NOPTS_VALUE set it to zero
2019-04-03 16:03:21 -04:00
055efdc950
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2019-04-03 14:56:18 -04:00
bd9b5afe46
old ffmpeg doesn't have av_frame_unref and it doesn't seem to be needed
2019-04-03 14:56:14 -04:00
b53e4aa803
fix segfault
2019-04-03 14:51:10 -04:00
b6f35db4de
put back codec closing in destructure, testing with bionic
2019-04-03 14:25:18 -04:00
aece64049f
We cannot avcodec_open2 a context that has been duped. This code currently works without crashes and leaks on ffmpeg 2.8
2019-04-03 13:23:00 -04:00
bd412fa9ca
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-02 14:25:50 -04:00
cd28559c03
when encoding audio, pts and dts have to come from the encoder.
2019-04-02 14:08:46 -04:00
87cb716500
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-01 14:02:46 -04:00
cb33318c4a
fix invalid memory access due to incorrect opening/closing/copying of contexts
2019-04-01 14:02:39 -04:00
ed5a448a1d
Correct pts on audio frame before sending it to the encoder so that when we flush the encoder the resulting packets have the right pts.
2019-04-01 11:13:14 -04:00
e6547953b0
fix segfault using old ffmpeg
2019-03-28 09:24:32 -04:00
5615cafc19
fix compile on old ffmpeg
2019-03-21 17:50:17 -04:00
c159dd8d10
cleanup and fix code that assumed H264
2019-03-21 14:13:56 -04:00
fcb9f76561
Fix out_frame->pts being nothing because we freed in_frame
2019-03-20 16:06:55 -04:00
3931baa2b6
fix build on old ffmpeg
2019-03-20 10:21:43 -04:00
a437c407a7
fix video_out_ctx init so that ffmpeg doesn't complain
2019-03-19 13:17:26 -04:00
9b713a489d
fix sleep time by using a comparison between the frame display time and the distance between now and when we started playing.
...
handle infinite fps
2019-03-06 14:50:36 -05:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
73ae3f49ed
Merge branch 'master' into storageareas
2019-03-05 11:35:55 -05:00
b1838de701
test turning off frag_custom
2019-03-05 11:35:16 -05:00
Isaac Connor
Isaac Connor