Confronta il testo

Trova la differenza tra due file di testo

Editor live

Comprimi invariate

Senza a capo

Layout

Livello di dettaglio

Evidenziazione sintassi

Diffchecker Desktop Il modo più sicuro per usare Diffchecker. Ottieni l'app Diffchecker Desktop: i tuoi diff non lasciano mai il tuo computer!Ottieni Desktop

resize_bgr2yuyv_diff

Creato 4 anni faIl diff non scade mai

26 rimozioni

Linee
Totale
Rimosso

Caratteri
Totale
Rimosso

Per continuare a utilizzare questa funzione, aggiorna a Diffchecker Pro Visualizza prezzi

100 linee

20 aggiunte

Linee
Totale
Aggiunto

Caratteri
Totale
Aggiunto

Per continuare a utilizzare questa funzione, aggiorna a Diffchecker Pro Visualizza prezzi

94 linee

#include "hls_stream.h"

#include "ap_int.h"

#include "common/xf_common.hpp"

#include "common/xf_infra.hpp"

#include "common/xf_utility.hpp"

#include "imgproc/xf_resize.hpp"

#include "imgproc/xf_cvt_color.hpp"

#include "imgproc/xf_cvt_color_1.hpp"

#define DATA_WIDTH 24

#define WIDTH 1920

#define HEIGHT 1080

#define NPIX XF_NPPC1

#define WIDTH 3840

#define IN_TYPE XF_8UC3

#define HEIGHT 2160

#define OUT_TYPE XF_16UC1

#define FILTER_SIZE 3

#define TYPE XF_8UC3

#define INTERPOLATION XF_INTERPOLATION_BILINEAR

#define MAXDOWNSCALE 9

typedef xf::cv::ap_axiu<DATA_WIDTH,1,1,1> interface_t;

typedef hls::stream<interface_t> stream_t;

template <int W, int TYPE, int ROWS, int COLS, int NPPC>

void axis2xfMat (hls::stream<ap_axiu<W, 1, 1, 1> >& AXI_video_strm, xf::cv::Mat<TYPE, ROWS, COLS, NPPC>& img) {

ap_axiu<W, 1, 1, 1> axi;

const int m_pix_width = XF_PIXELWIDTH(TYPE, NPPC) * XF_NPIXPERCYCLE(NPPC);

int rows = img.rows;

int cols = img.cols >> XF_BITSHIFT(NPPC);

assert(img.rows <= ROWS);

assert(img.cols <= COLS);

loop_row_axi2mat:

for (int i = 0; i < rows; i++) {

loop_col_zxi2mat:

for (int j = 0; j < cols; j++) {

#pragma HLS loop_flatten off

#pragma HLS pipeline II=1

AXI_video_strm.read(axi);

img.write(i*rows + j, axi.data(m_pix_width - 1, 0));

}

template <int W, int TYPE, int ROWS, int COLS, int NPPC>

void xfMat2axis(xf::cv::Mat<TYPE, ROWS, COLS, NPPC>& img, hls::stream<ap_axiu<W, 1, 1, 1> >& dst) {

ap_axiu<W, 1, 1, 1> axi;

int rows = img.rows;

int cols = img.cols >> XF_BITSHIFT(NPPC);

assert(img.rows <= ROWS);

assert(img.cols <= COLS);

const int m_pix_width = XF_PIXELWIDTH(TYPE, NPPC) * XF_NPIXPERCYCLE(NPPC);

loop_row_mat2axi:

for (int i = 0; i < rows; i++) {

loop_col_mat2axi:

for (int j = 0; j < cols; j++) {

#pragma HLS loop_flatten off

#pragma HLS pipeline II = 1

if ((j == cols-1) && (i == rows-1)) {

axi.last = 1;

} else {

axi.last = 0;

}

axi.data = 0;

axi.data(m_pix_width - 1, 0) = img.read(i*rows + j);

axi.keep = -1;

dst.write(axi);

}

void resize_accel(stream_t& src, stream_t& dst,

void bgr2yuyv_accel(stream_t& src, stream_t& dst) {

int src_rows, int src_cols,

int dst_rows, int dst_cols) {

#pragma HLS INTERFACE axis register both port=src

#pragma HLS INTERFACE axis register both port=dst

#pragma HLS INTERFACE s_axilite port=src_rows

#pragma HLS INTERFACE s_axilite port=src_cols

#pragma HLS INTERFACE s_axilite port=dst_rows

#pragma HLS INTERFACE s_axilite port=dst_cols

#pragma HLS INTERFACE s_axilite port=return

xf::cv::Mat<TYPE, HEIGHT, WIDTH, NPIX> src_mat(src_rows, src_cols);

xf::cv::Mat<IN_TYPE, HEIGHT, WIDTH, NPIX> src_mat(HEIGHT, WIDTH);

xf::cv::Mat<TYPE, HEIGHT, WIDTH, NPIX> dst_mat(dst_rows, dst_cols);

xf::cv::Mat<OUT_TYPE, HEIGHT, WIDTH, NPIX> dst_mat(HEIGHT, WIDTH);

#pragma HLS DATAFLOW

axis2xfMat<DATA_WIDTH, TYPE, HEIGHT, WIDTH, NPIX>(src, src_mat);

axis2xfMat<DATA_WIDTH, IN_TYPE, HEIGHT, WIDTH, NPIX>(src, src_mat);

xf::cv::resize<INTERPOLATION, TYPE, HEIGHT, WIDTH, HEIGHT, WIDTH, NPIX, MAXDOWNSCALE>(src_mat, dst_mat);

xf::cv::bgr2yuyv<IN_TYPE, OUT_TYPE, HEIGHT, WIDTH, NPIX>(src_mat, dst_mat);

xfMat2axis<DATA_WIDTH, TYPE, HEIGHT, WIDTH, NPIX>(dst_mat, dst);

xfMat2axis<DATA_WIDTH, OUT_TYPE, HEIGHT, WIDTH, NPIX>(dst_mat, dst);

}

Diff salvati

Testo originale

Apri file

#include "hls_stream.h"
#include "common/xf_common.hpp"
#include "common/xf_infra.hpp"
#include "imgproc/xf_resize.hpp"

#define DATA_WIDTH 24
#define NPIX XF_NPPC1

#define WIDTH 3840
#define HEIGHT 2160
#define FILTER_SIZE 3
#define TYPE XF_8UC3
#define INTERPOLATION XF_INTERPOLATION_BILINEAR
#define MAXDOWNSCALE 9

typedef xf::cv::ap_axiu<DATA_WIDTH,1,1,1> interface_t;
typedef hls::stream<interface_t> stream_t;

template <int W, int TYPE, int ROWS, int COLS, int NPPC>
void axis2xfMat (hls::stream<ap_axiu<W, 1, 1, 1> >& AXI_video_strm, xf::cv::Mat<TYPE, ROWS, COLS, NPPC>& img) {
    ap_axiu<W, 1, 1, 1> axi;

const int m_pix_width = XF_PIXELWIDTH(TYPE, NPPC) * XF_NPIXPERCYCLE(NPPC);

int rows = img.rows;
    int cols = img.cols >> XF_BITSHIFT(NPPC);

assert(img.rows <= ROWS);
    assert(img.cols <= COLS);

loop_row_axi2mat:
    for (int i = 0; i < rows; i++) {
    loop_col_zxi2mat:
        for (int j = 0; j < cols; j++) {
#pragma HLS loop_flatten off
#pragma HLS pipeline II=1

AXI_video_strm.read(axi);
            img.write(i*rows + j, axi.data(m_pix_width - 1, 0));
        }
    }
}

template <int W, int TYPE, int ROWS, int COLS, int NPPC>
void xfMat2axis(xf::cv::Mat<TYPE, ROWS, COLS, NPPC>& img, hls::stream<ap_axiu<W, 1, 1, 1> >& dst) {
    ap_axiu<W, 1, 1, 1> axi;

int rows = img.rows;
    int cols = img.cols >> XF_BITSHIFT(NPPC);

assert(img.rows <= ROWS);
    assert(img.cols <= COLS);

const int m_pix_width = XF_PIXELWIDTH(TYPE, NPPC) * XF_NPIXPERCYCLE(NPPC);

loop_row_mat2axi:
    for (int i = 0; i < rows; i++) {
    loop_col_mat2axi:
        for (int j = 0; j < cols; j++) {
#pragma HLS loop_flatten off
#pragma HLS pipeline II = 1

if ((j == cols-1) && (i == rows-1)) {
                axi.last = 1;
            } else {
                axi.last = 0;
            }

axi.data = 0;
            axi.data(m_pix_width - 1, 0) = img.read(i*rows + j);
            axi.keep = -1;
            dst.write(axi);
        }
    }
}

void resize_accel(stream_t& src, stream_t& dst,
                  int src_rows, int src_cols,
                  int dst_rows, int dst_cols) {

#pragma HLS INTERFACE axis register both port=src
    #pragma HLS INTERFACE axis register both port=dst

#pragma HLS INTERFACE s_axilite port=src_rows
    #pragma HLS INTERFACE s_axilite port=src_cols
    #pragma HLS INTERFACE s_axilite port=dst_rows
    #pragma HLS INTERFACE s_axilite port=dst_cols
    #pragma HLS INTERFACE s_axilite port=return

xf::cv::Mat<TYPE, HEIGHT, WIDTH, NPIX> src_mat(src_rows, src_cols);
    xf::cv::Mat<TYPE, HEIGHT, WIDTH, NPIX> dst_mat(dst_rows, dst_cols);

#pragma HLS DATAFLOW

axis2xfMat<DATA_WIDTH, TYPE, HEIGHT, WIDTH, NPIX>(src, src_mat);
    xf::cv::resize<INTERPOLATION, TYPE, HEIGHT, WIDTH, HEIGHT, WIDTH, NPIX, MAXDOWNSCALE>(src_mat, dst_mat);
    xfMat2axis<DATA_WIDTH, TYPE, HEIGHT, WIDTH, NPIX>(dst_mat, dst);

}

Testo modificato

Apri file

#include "hls_stream.h"
#include "ap_int.h"
#include "common/xf_common.hpp"
#include "common/xf_utility.hpp"
#include "imgproc/xf_cvt_color.hpp"
#include "imgproc/xf_cvt_color_1.hpp"

#define DATA_WIDTH 24

#define WIDTH 1920
#define HEIGHT 1080

#define NPIX XF_NPPC1

#define IN_TYPE  XF_8UC3
#define OUT_TYPE XF_16UC1

typedef xf::cv::ap_axiu<DATA_WIDTH,1,1,1> interface_t;
typedef hls::stream<interface_t> stream_t;

template <int W, int TYPE, int ROWS, int COLS, int NPPC>
void axis2xfMat (hls::stream<ap_axiu<W, 1, 1, 1> >& AXI_video_strm, xf::cv::Mat<TYPE, ROWS, COLS, NPPC>& img) {
    ap_axiu<W, 1, 1, 1> axi;

const int m_pix_width = XF_PIXELWIDTH(TYPE, NPPC) * XF_NPIXPERCYCLE(NPPC);

int rows = img.rows;
    int cols = img.cols >> XF_BITSHIFT(NPPC);

assert(img.rows <= ROWS);
    assert(img.cols <= COLS);

loop_row_axi2mat:
    for (int i = 0; i < rows; i++) {
    loop_col_zxi2mat:
        for (int j = 0; j < cols; j++) {
#pragma HLS loop_flatten off
#pragma HLS pipeline II=1

AXI_video_strm.read(axi);
            img.write(i*rows + j, axi.data(m_pix_width - 1, 0));
        }
    }
}

template <int W, int TYPE, int ROWS, int COLS, int NPPC>
void xfMat2axis(xf::cv::Mat<TYPE, ROWS, COLS, NPPC>& img, hls::stream<ap_axiu<W, 1, 1, 1> >& dst) {
    ap_axiu<W, 1, 1, 1> axi;

int rows = img.rows;
    int cols = img.cols >> XF_BITSHIFT(NPPC);

assert(img.rows <= ROWS);
    assert(img.cols <= COLS);

const int m_pix_width = XF_PIXELWIDTH(TYPE, NPPC) * XF_NPIXPERCYCLE(NPPC);

loop_row_mat2axi:
    for (int i = 0; i < rows; i++) {
    loop_col_mat2axi:
        for (int j = 0; j < cols; j++) {
#pragma HLS loop_flatten off
#pragma HLS pipeline II = 1

if ((j == cols-1) && (i == rows-1)) {
                axi.last = 1;
            } else {
                axi.last = 0;
            }

axi.data = 0;
            axi.data(m_pix_width - 1, 0) = img.read(i*rows + j);
            axi.keep = -1;
            dst.write(axi);
        }
    }
}

void bgr2yuyv_accel(stream_t& src, stream_t& dst) {
    #pragma HLS INTERFACE axis register both port=src
    #pragma HLS INTERFACE axis register both port=dst

#pragma HLS INTERFACE s_axilite port=return

xf::cv::Mat<IN_TYPE, HEIGHT, WIDTH, NPIX> src_mat(HEIGHT, WIDTH);
    xf::cv::Mat<OUT_TYPE, HEIGHT, WIDTH, NPIX> dst_mat(HEIGHT, WIDTH);

#pragma HLS DATAFLOW

axis2xfMat<DATA_WIDTH, IN_TYPE, HEIGHT, WIDTH, NPIX>(src, src_mat);
    xf::cv::bgr2yuyv<IN_TYPE, OUT_TYPE, HEIGHT, WIDTH, NPIX>(src_mat, dst_mat);
    xfMat2axis<DATA_WIDTH, OUT_TYPE, HEIGHT, WIDTH, NPIX>(dst_mat, dst);
}