Browse files

Fix some anticipated vector/wfm bugs (still untested)

  • Loading branch information...
1 parent 6ba940e commit b4d38b1e986998ccc31df1bd7b445d2d4371438e @asquared asquared committed Feb 1, 2012
Showing with 11 additions and 16 deletions.
  1. +1 −5 replay/replay_ingest.cpp
  2. +1 −6 replay/replay_mjpeg_ingest.cpp
  3. +9 −5 replay/replay_multiviewer.cpp
View
6 replay/replay_ingest.cpp
@@ -72,14 +72,10 @@ void ReplayIngest::run_thread( ) {
/* scale input and make JPEG thumbnail */
thumb = input->convert->CbYCrY8422_scaled(480, 270);
//enc.encode_to(thumb, dest.thumb_jpeg( ), dest.thumb_jpeg_size( ));
- delete thumb;
-
buf->finish_frame_write( );
/* scale down frame to send to monitor */
- monitor_frame = new ReplayRawFrame(
- input->convert->BGRAn8_scale_1_4( )
- );
+ monitor_frame = new ReplayRawFrame(thumb);
/* fill in monitor status info */
monitor_frame->source_name = buf->get_name( );
View
7 replay/replay_mjpeg_ingest.cpp
@@ -97,12 +97,7 @@ void ReplayMjpegIngest::run_thread( ) {
buf->finish_frame_write( );
/* scale down frame to send to monitor */
- monitor_frame = new ReplayRawFrame(
- decoded_monitor->convert->BGRAn8( )
- );
-
-
- delete decoded_monitor;
+ monitor_frame = new ReplayRawFrame(decoded_monitor);
/* fill in monitor status info */
monitor_frame->source_name = buf->get_name( );
View
14 replay/replay_multiviewer.cpp
@@ -83,13 +83,17 @@ void ReplayMultiviewer::run_thread( ) {
if (f != NULL) {
f->bgra_data = f->frame_data->convert->BGRAn8( );
- render_text(f);
- if (overlay == VECTORSCOPE) {
- render_vector(f);
- } else if (overlay == WAVEFORM) {
- render_waveform(f);
+ if (f->frame_data->pixel_format( ) == RawFrame::CbYCrY8422) {
+ if (overlay == VECTORSCOPE) {
+ render_vector(f);
+ } else if (overlay == WAVEFORM) {
+ render_waveform(f);
+ }
}
+
+ render_text(f);
+
dpy->draw->blit(src.x, src.y, f->bgra_data);
}
}

0 comments on commit b4d38b1

Please sign in to comment.